lianbingjie 6 years ago
parent
commit
10df32481b
100 changed files with 474 additions and 398 deletions
  1. 24 29
      src/config.json
  2. 2 2
      src/dataexport.json
  3. 4 4
      src/jfw/active/active.go
  4. 1 1
      src/jfw/active/jyswitch.go
  5. 1 1
      src/jfw/front/applysub.go
  6. 1 1
      src/jfw/front/dataExport.go
  7. 1 1
      src/jfw/front/dealinfo.go
  8. 21 21
      src/jfw/front/front.go
  9. 8 8
      src/jfw/front/laboratory.go
  10. 1 1
      src/jfw/front/otherAct.go
  11. 1 1
      src/jfw/front/pchelper.go
  12. 2 2
      src/jfw/front/search.go
  13. 4 1
      src/jfw/front/shorturl.go
  14. 14 14
      src/jfw/front/swordfish.go
  15. 7 7
      src/jfw/modules/app/src/app/front/front.go
  16. 8 8
      src/jfw/modules/app/src/app/front/laboratory.go
  17. 10 9
      src/jfw/modules/app/src/app/front/login.go
  18. 5 6
      src/jfw/modules/app/src/app/front/me.go
  19. 1 0
      src/jfw/modules/app/src/app/front/message.go
  20. 1 1
      src/jfw/modules/app/src/app/front/search.go
  21. 9 9
      src/jfw/modules/app/src/app/front/swordfish.go
  22. 11 14
      src/jfw/modules/app/src/config.json
  23. 18 18
      src/jfw/modules/app/src/seo.json
  24. BIN
      src/jfw/modules/app/src/src
  25. 4 4
      src/jfw/modules/app/src/web/staticres/jyapp/css/wxsearch.css
  26. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/about/mobile.png
  27. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/about/mobile_bak.png
  28. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/download-backage-weixin.jpg
  29. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/download-backage-weixin_bak.jpg
  30. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/images/download-backage_bak.jpg
  31. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/download-backage_new.png
  32. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/download-backage_new_bak.png
  33. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/jyicon_new.png
  34. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/logo.png
  35. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/logo_bak.png
  36. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/search/popup.png
  37. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/syzindex/sys-sjdc-02.png
  38. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/syzindex/sys-sjdc-02_bak.png
  39. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/syzindex/sys-zbqy.png
  40. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/syzindex/syz-bg.png
  41. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/syzindex/syz-bg_bak.png
  42. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/images/syzindex/zndy03.png
  43. 7 7
      src/jfw/modules/app/src/web/staticres/jyapp/js/common.js
  44. 2 2
      src/jfw/modules/app/src/web/staticres/jyapp/js/jypraise.js
  45. 56 0
      src/jfw/modules/app/src/web/staticres/jyapp/js/popup/tap.js
  46. 7 3
      src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js
  47. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/logo_new.png
  48. 1 1
      src/jfw/modules/app/src/web/templates/_err.html
  49. 1 1
      src/jfw/modules/app/src/web/templates/_error.html
  50. 1 1
      src/jfw/modules/app/src/web/templates/followent/list.html
  51. 3 3
      src/jfw/modules/app/src/web/templates/me/download.html
  52. 1 1
      src/jfw/modules/app/src/web/templates/me/index.html
  53. 1 1
      src/jfw/modules/app/src/web/templates/me/login.html
  54. 1 1
      src/jfw/modules/app/src/web/templates/me/notice.html
  55. 1 1
      src/jfw/modules/app/src/web/templates/me/pushMsgSet.html
  56. 1 1
      src/jfw/modules/app/src/web/templates/me/register.html
  57. 2 2
      src/jfw/modules/app/src/web/templates/me/set.html
  58. 1 1
      src/jfw/modules/app/src/web/templates/me/setpwd.html
  59. 20 20
      src/jfw/modules/app/src/web/templates/me/solveWay.html
  60. 9 9
      src/jfw/modules/app/src/web/templates/weixin/about.html
  61. 2 2
      src/jfw/modules/app/src/web/templates/weixin/feedback.html
  62. 1 1
      src/jfw/modules/app/src/web/templates/weixin/follow/list.html
  63. 2 2
      src/jfw/modules/app/src/web/templates/weixin/jylab/lab-cjss.html
  64. 3 3
      src/jfw/modules/app/src/web/templates/weixin/jylab/lab-gzqy.html
  65. 3 3
      src/jfw/modules/app/src/web/templates/weixin/jylab/lab-index.html
  66. 3 3
      src/jfw/modules/app/src/web/templates/weixin/jylab/lab-sjdc.html
  67. 2 2
      src/jfw/modules/app/src/web/templates/weixin/jylab/lab-zbqy.html
  68. 3 3
      src/jfw/modules/app/src/web/templates/weixin/jylab/lab-zndy.html
  69. 9 4
      src/jfw/modules/app/src/web/templates/weixin/messagedetail.html
  70. 1 1
      src/jfw/modules/app/src/web/templates/weixin/privacy.html
  71. 17 5
      src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
  72. 3 3
      src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html
  73. 3 0
      src/jfw/modules/app/src/web/templates/weixin/wxkeyset/area.html
  74. 1 1
      src/jfw/modules/app/src/web/templates/weixin/wxkeyset/index.html
  75. 1 1
      src/jfw/modules/app/src/web/templates/weixin/wxkeyset/seniorset.html
  76. 4 4
      src/jfw/modules/app/src/web/templates/weixin/wxtsguide.html
  77. 40 40
      src/jfw/modules/entsesearch/src/seo.json
  78. 1 1
      src/jfw/modules/entsesearch/src/web/staticres/jylab/entsesearch/js/login.js
  79. 4 4
      src/jfw/modules/entsesearch/src/web/staticres/jylab/entsesearch/wxswordfish/share.js
  80. 1 1
      src/jfw/modules/entsesearch/src/web/templates/weixin/entseSearch.html
  81. 40 40
      src/jfw/modules/followent/src/seo.json
  82. 4 4
      src/jfw/modules/followent/src/web/staticres/jylab/followent/wxswordfish/share.js
  83. 13 13
      src/jfw/modules/followent/src/web/templates/_error.html
  84. 1 1
      src/jfw/modules/followent/src/web/templates/weixin/list.html
  85. 4 4
      src/jfw/modules/followent/src/web/wxswordfish/share.js
  86. 1 1
      src/jfw/modules/pc/client/apple/bg.js
  87. 6 6
      src/jfw/modules/pc/client/apple/login.html
  88. 2 2
      src/jfw/modules/pc/client/apple/package.json
  89. 1 1
      src/jfw/modules/pc/client/jynotify/bg.js
  90. 6 6
      src/jfw/modules/pc/client/jynotify/login.html
  91. 2 2
      src/jfw/modules/pc/client/jynotify/package.json
  92. 1 1
      src/jfw/modules/portrait/src/web/staticres/portrait/login.js
  93. 4 4
      src/jfw/modules/push/src/config.json
  94. 1 1
      src/jfw/modules/push/src/qfw/push/dopush/dopush.go
  95. 1 1
      src/jfw/modules/push/src/qfw/push/dopush/dopushes.go
  96. 2 2
      src/jfw/modules/push/src/qfw/push/dopush/excel.go
  97. 4 4
      src/jfw/modules/push_v1/src/config.json
  98. 2 2
      src/jfw/modules/push_v1/src/push/dopush/excel.go
  99. 1 1
      src/jfw/modules/push_v1/src/push/dopush/pushjob.go
  100. BIN
      src/jfw/modules/push_v1/src/src

+ 24 - 29
src/config.json

@@ -1,5 +1,5 @@
 {
-    "mongodbServers": "127.0.0.1:27080",
+    "mongodbServers": "192.168.3.18:27080",
     "mongodbPoolSize": "25",
     "mongodbName": "qfw",
     "influxaddr": "http://192.168.3.207:8086",
@@ -10,7 +10,7 @@
     "elasticsearch": "http://192.168.3.18:9800",
     "elasticPoolSize": 30,
     "redisaddrs": "other=192.168.3.18:3379,push=192.168.3.18:3379,pushcache=192.168.3.18:3379,sso=192.168.3.18:3379,session=192.168.3.18:3379,recovery=192.168.3.18:3379",
-    "webport": "83",
+    "webport": "8089",
     "webrpcport": "8084",
     "weixinrpc": "127.0.0.1:8083",
     "cacheflag": false,
@@ -19,7 +19,7 @@
     ],
     "cassandrasize": 5,
     "agreement": "https",
-    "webdomain": "https://web-jydev-wcj.jianyu360.cn",
+    "webdomain": "https://webws.qmx.top",
     "redirect": {
         "searchinfo": "/jylab/mainSearch",
         "rssset": "/swordfish/historypush",
@@ -78,9 +78,7 @@
     "recommendThreshold": 0.5,
     "msg_server": "123.56.236.148:7070",
     "rewardText": [
-        "感觉不错?就给努力的剑鱼君打个赏吧!",
         "憋说话!赏我!",
-        "说好的一起投标,你却偷偷用剑鱼……",
         "“赏”就一个字 我只说一次",
         "厉害了word鱼!",
         "看官赏点银子偶会更卖力噢!",
@@ -88,37 +86,34 @@
         "夸我还是含蓄点的好,赏一个吧~",
         "爱,就供养;喜欢,就打赏!",
         "请简单粗暴地爱我!",
-        "最喜欢你一言不合就打赏的样子了~~~么么!",
-        "支持剑鱼,不问度娘,欢迎打赏,情深意长!",
-        "剑鱼君正在埋头钻研,感觉累累哒,求各位打赏!"
+        "最喜欢你一言不合就打赏的样子了~~~么么!"
     ],
     "advertText": [
-        "与其一个人孤单  不如一群人狂欢   赶快加入剑鱼社区",
-        "加入剑鱼标社区  和投标大神做朋友",
-        "来剑鱼标社区  找最合拍的伙伴",
-        "剑鱼标社区,让沟通连接你我。",
-        "剑鱼社区,分享你的知识、解决问题、行业资源交换",
+        "与其一个人孤单  不如一群人狂欢   赶快加入剑鱼标讯社区",
+        "加入剑鱼标社区  和投标大神做朋友",
+        "来剑鱼标社区  找最合拍的伙伴",
+        "剑鱼标社区,让沟通连接你我。",
+        "剑鱼标讯社区,分享你的知识、解决问题、行业资源交换",
         "勇敢发声,和老司机一起畅聊招投标。",
-        "春风十里,不如来剑鱼标社区!",
+        "春风十里,不如来剑鱼标社区!",
         "只要心相通,相隔千里也能畅快交流。",
-        "弹指一挥间,剑鱼因你而不同!",
+        "弹指一挥间,剑鱼标讯因你而不同!",
         "携手同行,认真对待每一次招投标"
     ],
     "recoveryText": [
         "火眼金睛的你,已超越99%的同行!",
-        "剑鱼君知错了,这就去改。",
         "感谢你及时纠正了我的胡说八道!",
-        "剑鱼已收到指示,并给你手动点赞。",
-        "感谢纠错,剑鱼正在火速补救。",
-        "听说帮剑鱼纠错的人最后都中了标!",
+        "剑鱼标讯已收到指示,并给你手动点赞。",
+        "感谢纠错,剑鱼标讯正在火速补救。",
+        "听说帮剑鱼标讯纠错的人最后都中了标!",
         "你帮助了众多投标人,很棒棒哟!",
-        "不嫌千辛万苦来纠错,剑鱼给你小心心!",
-        "感谢你的火眼金睛,剑鱼光速更新中...",
+        "不嫌千辛万苦来纠错,剑鱼标讯给你小心心!",
+        "感谢你的火眼金睛,剑鱼标讯光速更新中...",
         "老铁,我已收到,欢迎将纠错进行到底。"
     ],
     "recoveryRight": [
         "火眼金睛的你,已超越99%的同行!",
-        "剑鱼已收到指示,并给你手动点赞。",
+        "剑鱼标讯已收到指示,并给你手动点赞。",
         "你帮助了众多投标人,很棒棒哟!"
     ],
     "recoveryField": {
@@ -199,17 +194,17 @@
     "advertName": "广告",
     "advertUrl": "/swordfish/about",
     "wxJianyu": {
-        "appid": "wx5b1c6e7cc4dac0e4",
-        "appsecret": "b026103ffebd2291b3edb7a269612112",
+        "appid": "wx41a95e706276804d",
+        "appsecret": "1b385c7dd14274c5e0898b9b208580b7",
         "pay": {
             "mchid": "1418321102",
             "key": "topnet2016topnet2016topnet2016ab",
-            "attachmsg": "剑鱼打赏",
-            "bodymsg": "剑鱼-招标信息打赏",
+            "attachmsg": "剑鱼标讯打赏",
+            "bodymsg": "剑鱼标讯-招标信息打赏",
             "detailmsg": "招标推送信息[%s] 打赏%s元钱",
-			"sjdc_attachmsg": "剑鱼-历史数据",
-            "sjdc_bodymsg": "剑鱼-历史数据",
-            "sjdc_detailmsg": "剑鱼-历史数据"
+			"sjdc_attachmsg": "剑鱼标讯-历史数据",
+            "sjdc_bodymsg": "剑鱼标讯-历史数据",
+            "sjdc_detailmsg": "剑鱼标讯-历史数据"
         }
     },
     "industry": "分类综合测试",

File diff suppressed because it is too large
+ 2 - 2
src/dataexport.json


+ 4 - 4
src/jfw/active/active.go

@@ -17,7 +17,7 @@ type Active struct {
 	zqLuckdrawControl       xweb.Mapper `xweb:"/active/zqLuckdrawControl"`              //控制
 	saofuImage              xweb.Mapper `xweb:"/active/saofu/image"`                    //扫福
 	saofuIndex              xweb.Mapper `xweb:"/active/saofu"`                          //扫福
-	appExt                  xweb.Mapper `xweb:"/active/appExt/(.*)"`                    //剑鱼app推广活动
+	appExt                  xweb.Mapper `xweb:"/active/appExt/(.*)"`                    //剑鱼标讯app推广活动
 	//好友盖章年终奖活动
 	index       xweb.Mapper `xweb:"/active/seal/index"`       //盖章首页
 	sealFriends xweb.Mapper `xweb:"/active/sealfriends/(.*)"` //给好友盖章页面
@@ -28,9 +28,9 @@ type Active struct {
 	//	share       xweb.Mapper `xweb:"/active/seal/(.*).html"`      //分享后的页面
 	makeCheck        xweb.Mapper `xweb:"/active/seal/makeCheck"`    //自己是否被盖章
 	sealMsg          xweb.Mapper `xweb:"/active/seal/sealMsg"`      //通知消息跳转
-	jyswitch         xweb.Mapper `xweb:"/active/jyswitch/index"`    //剑鱼开关页面
-	jyswitchSeal     xweb.Mapper `xweb:"/active/jyswitch/seal"`     //剑鱼盖章开关页面
-	jyswitchSealPost xweb.Mapper `xweb:"/active/jyswitch/sealpost"` //剑鱼盖章开关页面
+	jyswitch         xweb.Mapper `xweb:"/active/jyswitch/index"`    //剑鱼标讯开关页面
+	jyswitchSeal     xweb.Mapper `xweb:"/active/jyswitch/seal"`     //剑鱼标讯盖章开关页面
+	jyswitchSealPost xweb.Mapper `xweb:"/active/jyswitch/sealpost"` //剑鱼标讯盖章开关页面
 	/****测试活动****/
 	futureIndex xweb.Mapper `xweb:"/active/(.*)/index"` //活动首页
 }

+ 1 - 1
src/jfw/active/jyswitch.go

@@ -1,6 +1,6 @@
 package active
 
-//剑鱼开关页面,配置各种开关
+//剑鱼标讯开关页面,配置各种开关
 
 import (
 	"qfw/util"

+ 1 - 1
src/jfw/front/applysub.go

@@ -123,7 +123,7 @@ func (a *Applysub) SendMsg() error {
 				param := make(map[string]string)
 				param["code"] = MsgCode
 				go func() {
-					public.SendSMS("2175916", phoneNum, param)
+					public.SendSMS("2828060", phoneNum, param)
 				}()
 				log.Println("手机号码", phoneNum, "验证码", MsgCode)
 			} else {

+ 1 - 1
src/jfw/front/dataExport.go

@@ -602,7 +602,7 @@ func subUrl(list *[]map[string]interface{}, dataType string) *[]map[string]inter
 		//加密截取url
 		href := util.ObjToString(v["href"])
 		url := util.ObjToString(v["url"])
-		if len(url) > 40 { //截取剑鱼地址
+		if len(url) > 40 { //截取剑鱼标讯地址
 			v["url"] = url[:40] + "*****" + url[len(url)-10:]
 		}
 		if len(href) > 40 { //截取原文地址

+ 1 - 1
src/jfw/front/dealinfo.go

@@ -26,7 +26,7 @@ func init_2() {
 	}
 	//client, _ = util.StartClient(func(p *util.Packet) {
 	//异步调用
-	//}, MSG_SERVER, "剑鱼抽关键词", []int{})
+	//}, MSG_SERVER, "剑鱼标讯抽关键词", []int{})
 }
 
 //func DealInfo_1(obj *map[string]interface{}, coll string) {

+ 21 - 21
src/jfw/front/front.go

@@ -46,22 +46,22 @@ type Front struct {
 	sess               xweb.Mapper `xweb:"/front/sess/(.*)"`        //微信跳转session登录
 	viewdemo           xweb.Mapper `xweb:"/front/viewdemo"`         //微信跳转session登录
 	getpage            xweb.Mapper `xweb:"/swordfish/getpage"`
-	wxsearch           xweb.Mapper `xweb:"/swordfish/search"`             //剑鱼微信查询
-	wxsearchlist       xweb.Mapper `xweb:"/swordfish/searchlist"`         //剑鱼微信查询结果展示
-	wxsearchlistPaging xweb.Mapper `xweb:"/swordfish/searchlist/paging"`  //剑鱼微信查询结果展示--分页
-	delWxHistorySearch xweb.Mapper `xweb:"/swordfish/delWxHistorySearch"` //剑鱼微信删除历史搜索
+	wxsearch           xweb.Mapper `xweb:"/swordfish/search"`             //剑鱼标讯微信查询
+	wxsearchlist       xweb.Mapper `xweb:"/swordfish/searchlist"`         //剑鱼标讯微信查询结果展示
+	wxsearchlistPaging xweb.Mapper `xweb:"/swordfish/searchlist/paging"`  //剑鱼标讯微信查询结果展示--分页
+	delWxHistorySearch xweb.Mapper `xweb:"/swordfish/delWxHistorySearch"` //剑鱼标讯微信删除历史搜索
 	ajaxReq            xweb.Mapper `xweb:"/member/swordfish/ajaxReq"`
 	wxpushView         xweb.Mapper `xweb:"/wxpush/wxpushview"`        //推送结果预览
 	wxpushViewPaging   xweb.Mapper `xweb:"/wxpush/wxpushview/paging"` //推送结果预览--分页
 	guide              xweb.Mapper `xweb:"/swordfish/guide/(.*)"`
 	share              xweb.Mapper `xweb:"/swordfish/share/([^.]*)"`
-	wxprotocol         xweb.Mapper `xweb:"/swordfish/wxprotocol"` //微信剑鱼协议
+	wxprotocol         xweb.Mapper `xweb:"/swordfish/wxprotocol"` //微信剑鱼标讯协议
 	delc               xweb.Mapper `xweb:"/delcache/(.+)"`        //删除模板缓存
 	wxpushListInfo     xweb.Mapper `xweb:"/wxpush/bidinfo/(.*)"`  //推送列表
 	feedback           xweb.Mapper `xweb:"/swordfish/feedback"`   //意见反馈
 	wxpushAjaxReq      xweb.Mapper `xweb:"/wxpush/bid/ajaxReq"`
-	newSordfish        xweb.Mapper `xweb:"/"`                                  //剑鱼pc首页
-	searchinfolist     xweb.Mapper `xweb:"/swordfish/searchinfolist(.*).html"` //剑鱼pc查询
+	newSordfish        xweb.Mapper `xweb:"/"`                                  //剑鱼标讯pc首页
+	searchinfolist     xweb.Mapper `xweb:"/swordfish/searchinfolist(.*).html"` //剑鱼标讯pc查询
 	about              xweb.Mapper `xweb:"/swordfish/about"`
 	shareabout         xweb.Mapper `xweb:"/swordfish/shareabout/([^.]*)"`
 	getIndexData       xweb.Mapper `xweb:"/front/index.*"`
@@ -79,10 +79,10 @@ type Front struct {
 	behaviorRecord     xweb.Mapper `xweb:"/member/behaviorRecord"`        //记录用户点击的关键词
 	tSGuide            xweb.Mapper `xweb:"/front/tenderSubscribe/guide"`  //引导页
 	transfer           xweb.Mapper `xweb:"/front/transfer"`               //原文链接中转
-	jyblog             xweb.Mapper `xweb:"/jyblog/index([^.]*).html"`     //剑鱼博客
-	jybdetail          xweb.Mapper `xweb:"/jyblog/([^.]*).html"`          //剑鱼博客三级页
-	blogpraise         xweb.Mapper `xweb:"/jyblog/blogpraise"`            //剑鱼博客三级页点赞
-	searchResult       xweb.Mapper `xweb:"/list/(\\w+)/(\\w+).html"`      //剑鱼分类 地区结果列表
+	jyblog             xweb.Mapper `xweb:"/jyblog/index([^.]*).html"`     //剑鱼标讯博客
+	jybdetail          xweb.Mapper `xweb:"/jyblog/([^.]*).html"`          //剑鱼标讯博客三级页
+	blogpraise         xweb.Mapper `xweb:"/jyblog/blogpraise"`            //剑鱼标讯博客三级页点赞
+	searchResult       xweb.Mapper `xweb:"/list/(\\w+)/(\\w+).html"`      //剑鱼标讯分类 地区结果列表
 	encrypt            xweb.Mapper `xweb:"/share/encrypt"`                //分享三级页加密
 	historypush        xweb.Mapper `xweb:"/swordfish/historypush"`        //历时推送记录
 	historypushPaging  xweb.Mapper `xweb:"/swordfish/historypush/paging"` //历时推送记录--分页
@@ -93,7 +93,7 @@ type Front struct {
 	/********************wxkeyset:v1.8**************************/
 	wxKeysetAjaxReq xweb.Mapper `xweb:"/wxkeyset/ajaxReq"`           //订阅词ajax请求
 	wxKeyset        xweb.Mapper `xweb:"/wxkeyset/keyset/(\\w+)"`     //订阅词设置
-	subscribe       xweb.Mapper `xweb:"/front/subscribe.html"`       //电脑版剑鱼设置
+	subscribe       xweb.Mapper `xweb:"/front/subscribe.html"`       //电脑版剑鱼标讯设置
 	gethotkey       xweb.Mapper `xweb:"/front/gethotkey"`            //获取热词
 	rediskw         xweb.Mapper `xweb:"/front/rediskw"`              //pc订阅词存redis
 	notin           xweb.Mapper `xweb:"/notin/page"`                 //未登录用户访问三级页中转页
@@ -106,7 +106,7 @@ type Front struct {
 	advservices     xweb.Mapper `xweb:"/front/advservices.html"` //广告服务
 	extension       xweb.Mapper `xweb:"/extension/(.*).html"`    //推广页面
 	recInof         xweb.Mapper `xweb:"/front/recovery/info"`    //纠错记录
-	downloadJyApp   xweb.Mapper `xweb:"/front/downloadJyApp"`    //下载剑鱼app的中转地址
+	downloadJyApp   xweb.Mapper `xweb:"/front/downloadJyApp"`    //下载剑鱼标讯app的中转地址
 	downloadJyAppQr xweb.Mapper `xweb:"/front/downloadJyApp/qr"` //扫码下载
 	limitSearchText xweb.Mapper `xweb:"/front/limitSearchText"`  //扫码下载
 	hpshare         xweb.Mapper `xweb:"/front/homepage/wxshare"` //扫码分享
@@ -485,7 +485,7 @@ func (f *Front) Followinfo() error {
 			}
 		}
 		if f.GetSession("RSource") == nil || util.ObjToString(f.GetSession("RSource")) == "" {
-			f.SetSession("RSource", "剑鱼网站")
+			f.SetSession("RSource", "剑鱼标讯网站")
 		}
 	}
 	userData["RSource"] = f.GetSession("RSource")
@@ -660,7 +660,7 @@ func (m *Front) Onekey() error {
 		if len([]rune(value)) > 200 {
 			value = util.SubString(value, 0, 200)
 		}
-		data["s_remark"] = "剑鱼-一键报告排版问题\n" + value
+		data["s_remark"] = "剑鱼标讯-一键报告排版问题\n" + value
 		data["s_mop"] = m.GetString("mop") //来源:移动端or电脑端
 		data["s_title"] = m.GetString("title")
 		data["i_status"] = 0
@@ -817,7 +817,7 @@ func (m *Front) Viewdemo() {
 	m.Redirect("/swordfish/guide/-1")
 }
 
-//剑鱼用户协议
+//剑鱼标讯用户协议
 func (m *Front) Wxprotocol() error {
 	return m.Render("/weixin/wxprotocol.html")
 }
@@ -915,15 +915,15 @@ func (m *Front) Feedback() error {
 	fromName := m.GetString("fromName")
 	if fromName != "" {
 		if fromName == "zndy" {
-			fromName = "剑鱼实验室-智能订阅"
+			fromName = "剑鱼标讯实验室-智能订阅"
 		} else if fromName == "sjdc" {
-			fromName = "剑鱼实验室-数据导出"
+			fromName = "剑鱼标讯实验室-数据导出"
 		} else if fromName == "cjss" {
-			fromName = "剑鱼实验室-超级搜索"
+			fromName = "剑鱼标讯实验室-超级搜索"
 		} else if fromName == "zbqy" {
-			fromName = "剑鱼实验室-中标企业"
+			fromName = "剑鱼标讯实验室-中标企业"
 		} else if fromName == "gzqy" {
-			fromName = "剑鱼实验室-关注企业"
+			fromName = "剑鱼标讯实验室-关注企业"
 		}
 	}
 	_, m.T["advertText"] = getRewardText()

+ 8 - 8
src/jfw/front/laboratory.go

@@ -18,7 +18,7 @@ import (
 
 type Lab struct {
 	*xweb.Action
-	/********************剑鱼实验室dev2.0**************************/
+	/********************剑鱼标讯实验室dev2.0**************************/
 	index          xweb.Mapper `xweb:"/jylab/index"`             //实验室首页
 	labMode        xweb.Mapper `xweb:"/jylab/laboratory/(\\w+)"` //智能订阅
 	operation      xweb.Mapper `xweb:"/jylab/operation"`         //用户操作按钮
@@ -100,7 +100,7 @@ func (l *Lab) Operation() error {
 	return nil
 }
 
-//剑鱼实验室首页
+//剑鱼标讯实验室首页
 func (l *Lab) Index() error {
 	defer util.Catch()
 	userid := util.ObjToString(l.GetSession("userId"))
@@ -115,7 +115,7 @@ func (l *Lab) Index() error {
 	return l.Render("/weixin/jylab/lab-index.html", &l.T)
 }
 
-//剑鱼实验室-智能订阅
+//剑鱼标讯实验室-智能订阅
 func (l *Lab) LabMode(mode string) error {
 	defer util.Catch()
 	userid := util.ObjToString(l.GetSession("userId"))
@@ -131,27 +131,27 @@ func (l *Lab) LabMode(mode string) error {
 	l.T["signature"] = wx.SignJSSDK(l.Site() + l.Url())
 	l.T["nickname"] = (*tmp)["s_nickname"]
 	l.T["avatar"] = (*tmp)["s_headimage"]
-	if mode == "zndy" { //剑鱼实验室-智能订阅
+	if mode == "zndy" { //剑鱼标讯实验室-智能订阅
 		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_smartset")
 		l.T["iknow"] = (*tmp)["i_smartsetiknow"]
 		return l.Render("/weixin/jylab/lab-zndy.html", &l.T)
 	}
-	if mode == "sjdc" { //剑鱼实验室-数据导出
+	if mode == "sjdc" { //剑鱼标讯实验室-数据导出
 		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_dataexport")
 		l.T["iknow"] = (*tmp)["i_dataexportiknow"]
 		return l.Render("/weixin/jylab/lab-sjdc.html", &l.T)
 	}
-	if mode == "cjss" { //剑鱼实验室-超级搜索
+	if mode == "cjss" { //剑鱼标讯实验室-超级搜索
 		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_supersearch")
 		l.T["iknow"] = (*tmp)["i_supersearchiknow"]
 		return l.Render("/weixin/jylab/lab-cjss.html", &l.T)
 	}
-	if mode == "zbqy" { //剑鱼实验室-中标企业
+	if mode == "zbqy" { //剑鱼标讯实验室-中标企业
 		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_entsesearch")
 		l.T["iknow"] = (*tmp)["i_entsesearchiknow"]
 		return l.Render("/weixin/jylab/lab-zbqy.html", &l.T)
 	}
-	if mode == "gzqy" { //剑鱼实验室-关注企业
+	if mode == "gzqy" { //剑鱼标讯实验室-关注企业
 		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_followent")
 		l.T["iknow"] = (*tmp)["i_followentiknow"]
 		return l.Render("/weixin/jylab/lab-gzqy.html", &l.T)

+ 1 - 1
src/jfw/front/otherAct.go

@@ -80,7 +80,7 @@ func (f *Front) SendMessage() {
 				param["code"] = MsgCode
 
 				go func() {
-					public.SendSMS("2175916", phoneNum, param)
+					public.SendSMS("2828060", phoneNum, param)
 				}()
 				fmt.Println("手机号码", phoneNum, "验证码", MsgCode)
 			} else {

+ 1 - 1
src/jfw/front/pchelper.go

@@ -371,7 +371,7 @@ func SendIdentCode(phone string, session *httpsession.Session) bool {
 	param := make(map[string]string)
 	param["code"] = s_ranNum
 	log.Println("验证码", phone, s_ranNum)
-	public.SendSMS("2175916", phone, param)
+	public.SendSMS("2828060", phone, param)
 	return true
 }
 

+ 2 - 2
src/jfw/front/search.go

@@ -14,8 +14,8 @@ import (
 
 type Search struct {
 	*xweb.Action
-	/********************剑鱼搜索dev2.0**************************/
-	mainSearch    xweb.Mapper `xweb:"/jylab/mainSearch"` //剑鱼搜索主页面
+	/********************剑鱼标讯搜索dev2.0**************************/
+	mainSearch    xweb.Mapper `xweb:"/jylab/mainSearch"` //剑鱼标讯搜索主页面
 	searchKeyword xweb.Mapper `xweb:"/jylab/searchKeyword/(.*)"`
 	getHK         xweb.Mapper `xweb:"/jylab/mainSearch/getHK"` //获取历史记录,订阅关键词
 

+ 4 - 1
src/jfw/front/shorturl.go

@@ -6,6 +6,7 @@ import (
 	"jfw/jyutil"
 	"jfw/public"
 	"jfw/wx"
+	"log"
 	"math/rand"
 	"net/url"
 	"qfw/util"
@@ -95,7 +96,7 @@ func (s *Short) Article(stype, id string) error {
 		userId = util.BsonIdToSId((*data1)["_id"])
 	}
 	if bm {
-		//判断有没有取关,取关的话,跳转到关于剑鱼页面
+		//判断有没有取关,取关的话,跳转到关于剑鱼标讯页面
 		if ssOpenid != nil && ssOpenid != "" {
 			isSubscribe := true
 			if !checkIsSubscribeFlag {
@@ -186,6 +187,7 @@ func (s *Short) Article(stype, id string) error {
 		sid := sids[0]
 		//log.Println("sid", sid)
 		var rec = ""
+		log.Println(redis.Get("recovery", "rec-"+ssOpenid.(string)), "ssOpenid:", ssOpenid)
 		if ssOpenid != nil && ssOpenid != "" && userId != "" {
 			if stype == "content" {
 				//判断是否需要强制分享
@@ -197,6 +199,7 @@ func (s *Short) Article(stype, id string) error {
 				}
 			}
 		}
+		log.Println("rec:", rec)
 		var res interface{}
 		if !isForceShare {
 			res = redis.Get("other", "jypcdetail_"+rec+sid)

+ 14 - 14
src/jfw/front/swordfish.go

@@ -48,7 +48,7 @@ func init() {
 	M, _ = Load("./zb.bin")
 }
 
-//剑鱼推送三级页点赞暂弃 改成剑鱼实验室点赞功能
+//剑鱼标讯推送三级页点赞暂弃 改成剑鱼标讯实验室点赞功能
 func (m *Front) Praise() error {
 	defer util.Catch()
 	var flag = "F"
@@ -68,7 +68,7 @@ func (m *Front) Praise() error {
 			}
 		}
 	}, func(e interface{}) {
-		log.Println("剑鱼实验室点赞出错", e)
+		log.Println("剑鱼标讯实验室点赞出错", e)
 	})
 	m.ServeJson(map[string]interface{}{
 		"flag": flag,
@@ -90,19 +90,19 @@ func (m *Front) Getpraise() error {
 		userid := m.Session().Get("userId")
 		tmp, _ := mongodb.FindById("user", userid.(string), `{"i_smartset":1,"i_dataexport":1,"i_supersearch":1,"i_entsesearch":1,"i_followent":1,"i_smartsetiknow":1,"i_dataexportiknow":1,"i_supersearchiknow":1,"i_entsesearchiknow":1,"i_followentiknow":1}`)
 		if thistype == "zndy" {
-			data["s_name"] = "剑鱼实验室-智能订阅"
+			data["s_name"] = "剑鱼标讯实验室-智能订阅"
 			switchstatus = util.IntAll((*tmp)["i_smartset"])
 		} else if thistype == "sjdc" {
-			data["s_name"] = "剑鱼实验室-数据导出"
+			data["s_name"] = "剑鱼标讯实验室-数据导出"
 			switchstatus = util.IntAll((*tmp)["i_dataexport"])
 		} else if thistype == "cjss" {
-			data["s_name"] = "剑鱼实验室-超级搜索"
+			data["s_name"] = "剑鱼标讯实验室-超级搜索"
 			switchstatus = util.IntAll((*tmp)["i_supersearch"])
 		} else if thistype == "zbqy" {
-			data["s_name"] = "剑鱼实验室-中标企业"
+			data["s_name"] = "剑鱼标讯实验室-中标企业"
 			switchstatus = util.IntAll((*tmp)["i_entsesearch"])
 		} else if thistype == "gzqy" {
-			data["s_name"] = "剑鱼实验室-关注企业"
+			data["s_name"] = "剑鱼标讯实验室-关注企业"
 			switchstatus = util.IntAll((*tmp)["i_followent"])
 		}
 		if len(*pdata) == 0 {
@@ -114,7 +114,7 @@ func (m *Front) Getpraise() error {
 			praiseno = util.IntAll((*pdata)["s_no"])
 		}
 	}, func(e interface{}) {
-		log.Println("剑鱼实验室取赞出错", e)
+		log.Println("剑鱼标讯实验室取赞出错", e)
 	})
 	m.ServeJson(map[string]interface{}{
 		"praiseno":     praiseno,
@@ -123,7 +123,7 @@ func (m *Front) Getpraise() error {
 	return nil
 }
 
-//剑鱼pc首页
+//剑鱼标讯pc首页
 func (m *Front) NewSordfish() error {
 	ispc, _ := m.GetInteger("ispc")
 	var shareid = m.GetString("id")
@@ -277,7 +277,7 @@ func detailLikeRpc(Interest []string, res *[]map[string]interface{}, flag bool)
 	return
 }
 
-//跳转到pc查询剑鱼信息列表
+//跳转到pc查询剑鱼标讯信息列表
 func (m *Front) Searchinfolist(p string) error {
 	defer util.Catch()
 	return m.Redirect("/jylab/supsearch/index.html")
@@ -1408,7 +1408,7 @@ func bidDataConvert(id string, datas *[]map[string]interface{}) (array []map[str
 	return array
 }
 
-//剑鱼保存
+//剑鱼标讯保存
 func (m *Front) AjaxReq() error {
 	defer util.Catch()
 	reqType := m.GetString("reqType")
@@ -1816,7 +1816,7 @@ func (m *Front) Aboutsearch() error {
 	return nil
 }
 
-//剑鱼微信查询保存网站
+//剑鱼标讯微信查询保存网站
 func (m *Front) AboutSR() error {
 	defer util.Catch()
 	var flag = "N"
@@ -1995,7 +1995,7 @@ func saveBehaviorRecord(sess *httpsession.Session, data bson.M) bool {
 	return len(mongodb.Save("behavior", data)) > 0
 }
 
-//取得剑鱼博客的信息列表
+//取得剑鱼标讯博客的信息列表
 func (f *Front) Jyblog(param /*参数*/ string) error {
 	querymap := map[string]string{}
 	if len(param) == 0 {
@@ -2024,7 +2024,7 @@ func (f *Front) Jyblog(param /*参数*/ string) error {
 	return nil
 }
 
-//实际的查询剑鱼博客
+//实际的查询剑鱼标讯博客
 func searhWebContentblog(querymap map[string]string) (*[]map[string]interface{}, *[]interface{}) {
 	perPage, _ := strconv.Atoi(querymap["perPage"])
 	currentPage, _ := strconv.Atoi(querymap["currentPage"])

+ 7 - 7
src/jfw/modules/app/src/app/front/front.go

@@ -29,7 +29,7 @@ type Front struct {
 	praise             xweb.Mapper `xweb:"/jyapp/swordfish/praise"`
 	myFeedbacks        xweb.Mapper `xweb:"/jyapp/swordfish/myFeedbacks"`
 	ajaxReq            xweb.Mapper `xweb:"/jyapp/member/swordfish/ajaxReq"`
-	wxsearchlistPaging xweb.Mapper `xweb:"/jyapp/swordfish/searchlist/paging"`  //剑鱼微信查询结果展示--分页
+	wxsearchlistPaging xweb.Mapper `xweb:"/jyapp/swordfish/searchlist/paging"`  //剑鱼标讯微信查询结果展示--分页
 	wxKeyset           xweb.Mapper `xweb:"/jyapp/wxkeyset/keyset/(\\w+)"`       //订阅词设置
 	wxKeysetAjaxReq    xweb.Mapper `xweb:"/jyapp/wxkeyset/ajaxReq"`             //订阅词ajax请求
 	wxpushView         xweb.Mapper `xweb:"/jyapp/wxpush/wxpushview"`            //推送结果预览
@@ -40,7 +40,7 @@ type Front struct {
 	getRecomKWs        xweb.Mapper `xweb:"/jyapp/member/getRecomKWs"`           //获取推荐关键词
 	behaviorRecord     xweb.Mapper `xweb:"/jyapp/member/behaviorRecord"`        //记录用户点击的关键词
 	wxpushAjaxReq      xweb.Mapper `xweb:"/jyapp/wxpush/bid/ajaxReq"`
-	delWxHistorySearch xweb.Mapper `xweb:"/jyapp/swordfish/delWxHistorySearch"` //剑鱼微信删除历史搜索
+	delWxHistorySearch xweb.Mapper `xweb:"/jyapp/swordfish/delWxHistorySearch"` //剑鱼标讯微信删除历史搜索
 	delOL              xweb.Mapper `xweb:"/jyapp/swordfish/delovertimelist"`    //手动删除30天无更新数据
 	wxpushListInfo     xweb.Mapper `xweb:"/jyapp/wxpush/bidinfo/(.*)"`          //推送列表
 	/*不需要登录*/
@@ -236,15 +236,15 @@ func (m *Front) Feedback() error {
 	fromName := m.GetString("fromName")
 	if fromName != "" {
 		if fromName == "zndy" {
-			fromName = "剑鱼实验室-智能订阅"
+			fromName = "剑鱼标讯实验室-智能订阅"
 		} else if fromName == "sjdc" {
-			fromName = "剑鱼实验室-数据导出"
+			fromName = "剑鱼标讯实验室-数据导出"
 		} else if fromName == "cjss" {
-			fromName = "剑鱼实验室-超级搜索"
+			fromName = "剑鱼标讯实验室-超级搜索"
 		} else if fromName == "zbqy" {
-			fromName = "剑鱼实验室-中标企业"
+			fromName = "剑鱼标讯实验室-中标企业"
 		} else if fromName == "gzqy" {
-			fromName = "剑鱼实验室-关注企业"
+			fromName = "剑鱼标讯实验室-关注企业"
 		}
 	}
 	_, m.T["advertText"] = getRewardText()

+ 8 - 8
src/jfw/modules/app/src/app/front/laboratory.go

@@ -10,7 +10,7 @@ import (
 
 type Lab struct {
 	*xweb.Action
-	/********************剑鱼实验室dev2.0**************************/
+	/********************剑鱼标讯实验室dev2.0**************************/
 	index     xweb.Mapper `xweb:"/jyapp/jylab/index"`             //实验室首页
 	labMode   xweb.Mapper `xweb:"/jyapp/jylab/laboratory/(\\w+)"` //智能订阅
 	operation xweb.Mapper `xweb:"/jyapp/jylab/operation"`         //用户操作按钮
@@ -84,12 +84,12 @@ func (l *Lab) Operation() error {
 	return nil
 }
 
-//剑鱼实验室首页
+//剑鱼标讯实验室首页
 func (l *Lab) Index() error {
 	return l.Render("/weixin/jylab/lab-index.html")
 }
 
-//剑鱼实验室-智能订阅
+//剑鱼标讯实验室-智能订阅
 func (l *Lab) LabMode(mode string) error {
 	defer util.Catch()
 	userid := util.ObjToString(l.GetSession("userId"))
@@ -97,27 +97,27 @@ func (l *Lab) LabMode(mode string) error {
 	if !ok || tmp == nil || len(*tmp) == 0 {
 		return nil
 	}
-	if mode == "zndy" { //剑鱼实验室-智能订阅
+	if mode == "zndy" { //剑鱼标讯实验室-智能订阅
 		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_smartset")
 		l.T["iknow"] = (*tmp)["i_smartsetiknow"]
 		return l.Render("/weixin/jylab/lab-zndy.html", &l.T)
 	}
-	if mode == "sjdc" { //剑鱼实验室-数据导出
+	if mode == "sjdc" { //剑鱼标讯实验室-数据导出
 		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_dataexport")
 		l.T["iknow"] = (*tmp)["i_dataexportiknow"]
 		return l.Render("/weixin/jylab/lab-sjdc.html", &l.T)
 	}
-	if mode == "cjss" { //剑鱼实验室-超级搜索
+	if mode == "cjss" { //剑鱼标讯实验室-超级搜索
 		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_supersearch")
 		l.T["iknow"] = (*tmp)["i_supersearchiknow"]
 		return l.Render("/weixin/jylab/lab-cjss.html", &l.T)
 	}
-	if mode == "zbqy" { //剑鱼实验室-中标企业
+	if mode == "zbqy" { //剑鱼标讯实验室-中标企业
 		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_entsesearch")
 		l.T["iknow"] = (*tmp)["i_entsesearchiknow"]
 		return l.Render("/weixin/jylab/lab-zbqy.html", &l.T)
 	}
-	if mode == "gzqy" { //剑鱼实验室-关注企业
+	if mode == "gzqy" { //剑鱼标讯实验室-关注企业
 		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_followent")
 		l.T["iknow"] = (*tmp)["i_followentiknow"]
 		return l.Render("/weixin/jylab/lab-gzqy.html", &l.T)

+ 10 - 9
src/jfw/modules/app/src/app/front/login.go

@@ -724,28 +724,29 @@ func (l *Login) SignOut() {
 func (l *Login) AfterPageLoadToCheck() {
 	sign := l.GetString("sign")
 	status := 1
+	returnSign := ""
+	updateflag := true
 	if sign != "" {
 		status = TimeCheckRepeatLogin_C(l.Session(), sign)
 	}
-	returnSign := ""
-	updateflag := false
 	if status == 1 {
 		rid := l.GetString("rid")
 		oid := l.GetString("oid")
 		version := l.GetString("version")
 		phoneType := l.GetString("phoneType")
 		returnSign = UpdateRid_C(l.Session(), rid, oid, phoneType, version)
-		//
+	}
+	//
+	powerarr, _ := config.Sysconfig["appPower"].(map[string]interface{})
+	grayflag, _ := powerarr["grayflag"].(bool)
+	if grayflag {
+		updateflag = false
 		userid, _ := l.GetSession("userId").(string)
-		powerarr, _ := config.Sysconfig["appPower"].(map[string]interface{})
-		grayflag, _ := powerarr["grayflag"].(bool)
-		if grayflag {
+		if userid != "" {
 			gray_str, err := redis.Exists("session", "grayusers_"+userid)
 			if err == nil {
 				updateflag = gray_str
 			}
-		} else {
-			updateflag = true
 		}
 	}
 	l.ServeJson(map[string]interface{}{
@@ -805,7 +806,7 @@ func SendIdentCode(phone string, session *httpsession.Session) bool {
 	param := make(map[string]string)
 	param["code"] = s_ranNum
 	log.Println("验证码", phone, s_ranNum)
-	public.SendSMS("2175916", phone, param)
+	public.SendSMS("2828060", phone, param)
 	return true
 }
 

+ 5 - 6
src/jfw/modules/app/src/app/front/me.go

@@ -139,16 +139,15 @@ func (l *Me) CheckUpdate() error {
 	var grayflag = powerarr["grayflag"].(bool)
 	var usertoken = l.GetString("token")
 	updata := config.Sysconfig["update"].(map[string]interface{})
-	updata["userflag"] = false
-	u, s := analySign("", usertoken)
-	if s == 1 {
-		if grayflag {
+	updata["userflag"] = true
+	if grayflag {
+		updata["userflag"] = false
+		u, s := analySign("", usertoken)
+		if s == 1 {
 			gray_str, err := redis.Exists("session", "grayusers_"+u.UserId)
 			if err == nil {
 				updata["userflag"] = gray_str
 			}
-		} else {
-			updata["userflag"] = true
 		}
 	}
 	l.ServeJson(updata)

+ 1 - 0
src/jfw/modules/app/src/app/front/message.go

@@ -20,6 +20,7 @@ func init() {
 }
 
 func (m *Message) MesContent(_id string) error {
+	m.T["tapRefer"] = m.GetString("tapRefer")
 	if ret := redis.Get("other", "jymessage_"+_id); ret != nil {
 		var retlist *map[string]interface{}
 		b, _ := json.Marshal(ret)

+ 1 - 1
src/jfw/modules/app/src/app/front/search.go

@@ -12,7 +12,7 @@ import (
 
 type Search struct {
 	*xweb.Action
-	mainSearch          xweb.Mapper `xweb:"/jyapp/jylab/mainSearch"` //剑鱼搜索主页面
+	mainSearch          xweb.Mapper `xweb:"/jyapp/jylab/mainSearch"` //剑鱼标讯搜索主页面
 	getstatus           xweb.Mapper `xweb:"/jyapp/jylab/supsearch/getstatus"`
 	getHK               xweb.Mapper `xweb:"/jyapp/jylab/mainSearch/getHK"` //获取历史记录,订阅关键词
 	updateSearchHistory xweb.Mapper `xweb:"/jyapp/jylab/updateSearchHistory"`

+ 9 - 9
src/jfw/modules/app/src/app/front/swordfish.go

@@ -42,7 +42,7 @@ func init() {
 	M, _ = Load("./zb.bin")
 }
 
-//剑鱼推送三级页点赞暂弃 改成剑鱼实验室点赞功能
+//剑鱼标讯推送三级页点赞暂弃 改成剑鱼标讯实验室点赞功能
 func (m *Front) Praise() error {
 	defer util.Catch()
 	var flag = "F"
@@ -62,7 +62,7 @@ func (m *Front) Praise() error {
 			}
 		}
 	}, func(e interface{}) {
-		log.Println("剑鱼实验室点赞出错", e)
+		log.Println("剑鱼标讯实验室点赞出错", e)
 	})
 	m.ServeJson(map[string]interface{}{
 		"flag": flag,
@@ -81,19 +81,19 @@ func (m *Front) Getpraise() error {
 		userid := util.ObjToString(m.GetSession("userId"))
 		tmp, _ := mongodb.FindById("user", userid, `{"i_smartset":1,"i_dataexport":1,"i_supersearch":1,"i_entsesearch":1,"i_followent":1,"i_smartsetiknow":1,"i_dataexportiknow":1,"i_supersearchiknow":1,"i_entsesearchiknow":1,"i_followentiknow":1}`)
 		if thistype == "zndy" {
-			data["s_name"] = "剑鱼实验室-智能订阅"
+			data["s_name"] = "剑鱼标讯实验室-智能订阅"
 			switchstatus = util.IntAll((*tmp)["i_smartset"])
 		} else if thistype == "sjdc" {
-			data["s_name"] = "剑鱼实验室-数据导出"
+			data["s_name"] = "剑鱼标讯实验室-数据导出"
 			switchstatus = util.IntAll((*tmp)["i_dataexport"])
 		} else if thistype == "cjss" {
-			data["s_name"] = "剑鱼实验室-超级搜索"
+			data["s_name"] = "剑鱼标讯实验室-超级搜索"
 			switchstatus = util.IntAll((*tmp)["i_supersearch"])
 		} else if thistype == "zbqy" {
-			data["s_name"] = "剑鱼实验室-中标企业"
+			data["s_name"] = "剑鱼标讯实验室-中标企业"
 			switchstatus = util.IntAll((*tmp)["i_entsesearch"])
 		} else if thistype == "gzqy" {
-			data["s_name"] = "剑鱼实验室-关注企业"
+			data["s_name"] = "剑鱼标讯实验室-关注企业"
 			switchstatus = util.IntAll((*tmp)["i_followent"])
 		}
 		if len(*pdata) == 0 {
@@ -105,7 +105,7 @@ func (m *Front) Getpraise() error {
 			praiseno = util.IntAll((*pdata)["s_no"])
 		}
 	}, func(e interface{}) {
-		log.Println("剑鱼实验室取赞出错", e)
+		log.Println("剑鱼标讯实验室取赞出错", e)
 	})
 	m.ServeJson(map[string]interface{}{
 		"praiseno":     praiseno,
@@ -182,7 +182,7 @@ const (
 	FINDF = `"title"`
 )
 
-//剑鱼保存
+//剑鱼标讯保存
 func (m *Front) AjaxReq() error {
 	defer util.Catch()
 	reqType := m.GetString("reqType")

+ 11 - 14
src/jfw/modules/app/src/config.json

@@ -7,7 +7,7 @@
     "elasticsearch": "http://192.168.3.18:9800",
     "elasticPoolSize": 30,
     "redisaddrs": "other=192.168.3.18:2379,push=192.168.3.18:2379,pushcache=192.168.3.18:2379,sso=192.168.3.18:2379,session=192.168.3.18:3379",
-    "webport": "86",
+    "webport": "8080",
     "weixinrpc": "127.0.0.1:8083",
     "cassandra": [
         "192.168.3.207"
@@ -15,7 +15,7 @@
     "cassandrasize": 5,
     "cacheflag": false,
     "agreement": "http",
-    "webdomain": "http://webwcj.qmx.top",
+    "webdomain": "http://webws.qmx.top",
     "redirect": {
         "wxpushlist": "/jyapp/wxpush/bidinfo/%s",
         "newInfoFollow": "/jyapp/followent/newInfo/%s",
@@ -34,9 +34,7 @@
     "followPushRpc": "127.0.0.1:8759",
     "recommendThreshold": 0.5,
     "rewardText": [
-        "感觉不错?就给努力的剑鱼君打个赏吧!",
         "憋说话!赏我!",
-        "说好的一起投标,你却偷偷用剑鱼……",
         "“赏”就一个字 我只说一次",
         "厉害了word鱼!",
         "看官赏点银子偶会更卖力噢!",
@@ -44,20 +42,18 @@
         "夸我还是含蓄点的好,赏一个吧~",
         "爱,就供养;喜欢,就打赏!",
         "请简单粗暴地爱我!",
-        "最喜欢你一言不合就打赏的样子了~~~么么!",
-        "支持剑鱼,不问度娘,欢迎打赏,情深意长!",
-        "剑鱼君正在埋头钻研,感觉累累哒,求各位打赏!"
+        "最喜欢你一言不合就打赏的样子了~~~么么!"
     ],
     "advertText": [
-        "与其一个人孤单  不如一群人狂欢   赶快加入剑鱼社区",
-        "加入剑鱼标社区  和投标大神做朋友",
-        "来剑鱼标社区  找最合拍的伙伴",
-        "剑鱼标社区,让沟通连接你我。",
-        "剑鱼社区,分享你的知识、解决问题、行业资源交换",
+        "与其一个人孤单  不如一群人狂欢   赶快加入剑鱼标讯社区",
+        "加入剑鱼标社区  和投标大神做朋友",
+        "来剑鱼标社区  找最合拍的伙伴",
+        "剑鱼标社区,让沟通连接你我。",
+        "剑鱼标讯社区,分享你的知识、解决问题、行业资源交换",
         "勇敢发声,和老司机一起畅聊招投标。",
-        "春风十里,不如来剑鱼标社区!",
+        "春风十里,不如来剑鱼标社区!",
         "只要心相通,相隔千里也能畅快交流。",
-        "弹指一挥间,剑鱼因你而不同!",
+        "弹指一挥间,剑鱼标讯因你而不同!",
         "携手同行,认真对待每一次招投标"
     ],
     "advertImg": "/jyapp/images/advert.png",
@@ -68,6 +64,7 @@
     "update": {
         "version": "1.0.3",
         "mustupdate": false,
+		"tipspace": 86400,
 		"ios_version": "1.0.3",
         "ios_mustupdate": false,
         "apkurl": "http://webwcj.qmx.top/jyapp/res/jianyu360.apk"

+ 18 - 18
src/jfw/modules/app/src/seo.json

@@ -2,75 +2,75 @@
 	"cdn":"",
     "qfw": {
         "swordfish": {
-            "description": "剑鱼招标订阅为用户提供个性化定制的全行业招标信息订阅推送服务,用户只需微信关注剑鱼招标订阅并合理设定招标关键词,无需下载APP,即可实现海量招标信息智能推送。",
-            "key": "剑鱼招标订阅,招标订阅,招标推送,招标信息,招标公告,中标公告",
-            "title": "剑鱼招标订阅,全行业招标信息智能推送领导者!"
+            "description": "剑鱼标讯为用户提供个性化定制的全行业招标信息订阅推送服务,用户只需微信关注剑鱼标讯并合理设定招标关键词,无需下载APP,即可实现海量招标信息智能推送。",
+            "key": "剑鱼标讯,招标订阅,招标推送,招标信息,招标公告,中标公告",
+            "title": "剑鱼标讯,全行业招标信息智能推送领导者!"
         },
 		"swordfishsl": {
-            "description": "剑鱼招标订阅搜索功能依据用户输入的招标关键词,快速展现最新最全的行业招标信息搜索结果,招标公告与中标公告,一应俱全。",
-            "key": "招标搜索结果,招标搜索,剑鱼招标订阅",
-            "title": "招标搜索结果_剑鱼招标订阅,全行业招标信息智能推送领导者!"
+            "description": "剑鱼标讯搜索功能依据用户输入的招标关键词,快速展现最新最全的行业招标信息搜索结果,招标公告与中标公告,一应俱全。",
+            "key": "招标搜索结果,招标搜索,剑鱼标讯",
+            "title": "招标搜索结果_剑鱼标讯,全行业招标信息智能推送领导者!"
         }
     },
 	"version":"1427",
 	"industry":{
 		"JZGC":{"NAME":"建筑工程_勘察设计,建筑工程_工程施工,建筑工程_监理咨询,建筑工程_材料设备,建筑工程_机电安装",
-				"TITLE":"建筑工程_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"建筑工程_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"",
 				"DESCRIPTION":""
 			},
 		"SLSD":{"NAME":"水利水电_水利工程,水利水电_发电工程,水利水电_航运工程,水利水电_其他工程",
-				"TITLE":"水利水电_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"水利水电_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"",
 				"DESCRIPTION":""
 			},
 		"NYHG":{	"NAME":"能源化工_原材料,能源化工_仪器仪表,能源化工_新能源,能源化工_设备物资,能源化工_化工产品,能源化工_设备",
-				"TITLE":"能源化工_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"能源化工_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"",
 				"DESCRIPTION":""
 			},
 		"RDAF":{"NAME":"弱电安防_综合布线,弱电安防_智能系统,弱电安防_智能家居",
-				"TITLE":"弱电安防_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"弱电安防_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"",
 				"DESCRIPTION":""
 			},
 		"XXJS":{"NAME":"信息技术_系统集成及安全,信息技术_软件开发,信息技术_运维服务,信息技术_其他",
-				"TITLE":"信息技术_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"信息技术_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"",
 				"DESCRIPTION":""
 			},
 		"XZBG":{"NAME":"行政办公_办公家具,行政办公_通用办公设备,行政办公_专业设备,行政办公_办公用品,行政办公_生活用品",
-				"TITLE":"行政办公_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"行政办公_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"",
 				"DESCRIPTION":""
 			},
 		"JXSB":{"NAME":"机械设备_矿山机械,机械设备_工程机械,机械设备_机械零部件,机械设备_机床相关,机械设备_车辆,机械设备_其他机械设备",
-				"TITLE":"机械设备_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"机械设备_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"",
 				"DESCRIPTION":""
 			},
 		"JTGC":{"NAME":"交通工程_道路,交通工程_轨道,交通工程_桥梁,交通工程_隧道,交通工程_其他",
-				"TITLE":"交通工程_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"交通工程_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"",
 				"DESCRIPTION":""
 			},
 		"YLWS":{"NAME":"医疗卫生_设备,医疗卫生_耗材,医疗卫生_药品",
-				"TITLE":"医疗卫生_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"医疗卫生_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"",
 				"DESCRIPTION":""
 			},
 		"SZSS":{"NAME":"市政设施_道路,市政设施_绿化,市政设施_线路管网,市政设施_综合项目",
-				"TITLE":"市政设施_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"市政设施_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"",
 				"DESCRIPTION":""
 			},
 		"FWCG":{"NAME":"服务采购_法律咨询,服务采购_会计,服务采购_物业,服务采购_审计,服务采购_安保,服务采购_仓储物流,服务采购_广告宣传印刷,服务采购_其他",
-				"TITLE":"服务采购_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"服务采购_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"",
 				"DESCRIPTION":""
 			},
 		"NLMY":{"NAME":"农林牧渔_生产物资,农林牧渔_生产设备,农林牧渔_相关服务",
-				"TITLE":"农林牧渔_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"农林牧渔_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"",
 				"DESCRIPTION":""
 			}

BIN
src/jfw/modules/app/src/src


+ 4 - 4
src/jfw/modules/app/src/web/staticres/jyapp/css/wxsearch.css

@@ -1773,8 +1773,8 @@ body{
     top: 30%;
     left: 50%;
 /*    background-color: #000;*/
-    width: 250px;
-    margin-left: -125px;
+    width: 270px;
+    margin-left: -135px;
     border-radius: 5px;
 /*    padding: 10px 20px;*/
 /*    text-align: center;*/
@@ -2223,10 +2223,10 @@ body{
 }
 .TableText{    
 	background-color: #000;
-    width: 250px;
+    width: 270px;
 /*    margin-left: -125px;*/
     border-radius: 5px;
-    padding: 10px 20px;
+    padding: 10px 15px;
     color: #fff;
     opacity: 0.75;
 }

BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/about/mobile.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/about/mobile_bak.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/download-backage-weixin.jpg


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/download-backage-weixin_bak.jpg


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/images/download-backage.jpg → src/jfw/modules/app/src/web/staticres/jyapp/images/download-backage_bak.jpg


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/download-backage_new.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/download-backage_new_bak.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/jyicon_new.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/logo.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/logo_bak.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/search/popup.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/syzindex/sys-sjdc-02.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/syzindex/sys-sjdc-02_bak.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/syzindex/sys-zbqy.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/syzindex/syz-bg.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/syzindex/syz-bg_bak.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/images/syzindex/zndy03.png


+ 7 - 7
src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -62,7 +62,9 @@ $(function(){
 //		}
 //	});
 	if(!mySysIsIos()){
-		afterPageInit();
+		try{
+			afterPageInit();
+		}catch(e){}
 	}
 });
 var EasyAlert = {
@@ -356,9 +358,6 @@ function afterPageInit(){
 	var sign = JyObj.getUserToken();
 	var rid = JyObj.getPushRid();
 	var oid = getOtherPushId();
-	if(!sign||(!rid&&!oid)){
-		return;
-	}
 	$.post("/jyapp/free/afterPageLoadToCheck?t="+new Date().getTime(),{sign:sign,rid:rid,oid:oid,phoneType:getPhoneType(),version:JyObj.getVersion()},function(r){
 		if(mySysIsIos()){
 			if(r.updateflag){
@@ -369,6 +368,7 @@ function afterPageInit(){
 						JyObj.openExternalLink(r.webdomain+"/jyapp/free/goToUpdate?mustupdate=1","-1");
 					}else{
 						if(localStorage.onceTipUpdate != "1"){
+							sessionStorage.onceTipUpdate = "1";
 							localStorage.onceTipUpdate = "1";
 							JyObj.openExternalLink(r.webdomain+"/jyapp/free/goToUpdate?mustupdate=1","去更新");
 						}
@@ -504,9 +504,9 @@ function checkRid(){
 }
 //随机获取分享文案
 var ShareText = [
-	"我和投标伙伴都在用剑鱼找项目,推荐你也试试",
-	"我用剑鱼免费查到超多招标信息,推荐你也试试",
-	"我收到了剑鱼免费推送的招标信息,推荐你也试试",
+	"我和投标伙伴都在用剑鱼标讯找项目,推荐你也试试",
+	"我用剑鱼标讯免费查到超多招标信息,推荐你也试试",
+	"我收到了剑鱼标讯免费推送的招标信息,推荐你也试试",
 	"发现了一个投标神器,推荐你也试试"
 ]
 function getShareText(){

+ 2 - 2
src/jfw/modules/app/src/web/staticres/jyapp/js/jypraise.js

@@ -115,7 +115,7 @@ function sysThumbsUp() {
 		$(".share").show();
 	})
 };
-/**剑鱼点赞js**/
+/**剑鱼标讯点赞js**/
 
 var labflag = true;
 //
@@ -239,7 +239,7 @@ function myCommonShare(shareType,flag){
 	if(shareType !=2 && nickname != ""){
 		title += nickname;	
 	}
-	title += "向您推荐了剑鱼招标订阅";
+	title += "向您推荐了剑鱼标讯";
 	var content = "全国招标信息免费看,不遮挡";
 	var url = ZBADDRESS+"/swordfish/about?source=app_labshare";
 	if(shareType == 3){

+ 56 - 0
src/jfw/modules/app/src/web/staticres/jyapp/js/popup/tap.js

@@ -0,0 +1,56 @@
+
+//$(function () {
+	window.onload =function(){
+		setTimeout(function(){
+			var version = JyObj.getVersion();
+			if (localStorage.getItem("popup_bx_"+version) != "A"){
+				var tapHtml = '<div class="modal fade" id="myModal-tap" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="true">'
+				+'<div class="modal-dialog">'
+				+'<div class="pop-new" style="width: 5.6rem;height: 7.2rem;background: url(../images/search/popup.png);background-size: cover;border-radius: 8px;position: relative;top: 3.5rem;left: 50%;margin-left: -2.8rem;">'
+				+'<div style="position: absolute;top: -1rem;left: 5.25rem;height: 1rem; border-left: 1px solid #fff;font-family: 微软雅黑;"></div>'
+				+'<div style="position: absolute;color: #0687DB;font-size: 14px;bottom: .6rem;left: 50%;margin-left: -2.3rem;font-family: 微软雅黑;width: 4.6rem;border: 1px solid #fff;border-radius: 6px;text-align: center;background-color: #fff;cursor: pointer;height: .8rem;line-height: .8rem;" onclick="details()">查看详情</div>'
+				+'<div style="width: .5rem;height: .5rem;position: absolute;left: 5rem;top: -1.5rem;cursor: pointer;border: 1px solid #fff;border-radius: 15px;padding: 2px;" ><img class="popClose" style="width: 100%;" src="../images/search/dy_close.png" onclick="popClose(\''+version+'\')"></div>'
+				+'</div>'
+				+'</div>'
+				+'</div>'
+				$("body").append(tapHtml)
+				$("#myModal-tap").modal("show");
+				addStorge(version);
+			}else{
+				try{
+					$("#myModal-tap").modal("hide");
+				}catch(e){}
+			}
+		},500)
+	}
+//});
+
+function popClose(version){
+	addStorge(version);
+	$("#myModal-tap").modal("hide");
+}
+
+function details(){
+	popClose();
+	var loginFlag = true
+	var tapRefer = "N"
+	var link = "https://res.jianyu360.com/jyapp/free/message/QQwSV1YVAVEBA0xfEVpSEQAGAg1CDUZa.html";
+	if(mySysIsIos()){
+		link = "https://res.jianyu360.com/jyapp/free/message/QQwSV1YXUQABA0xfEVpSEQAGAg1CDUZb.html"
+	}
+	if(userId != null&&userId != ""){
+		tapRefer = "T"
+		window.location.href = link+"?tapRefer="+tapRefer;
+	}else{
+		JyObj.openExternalLink(link+"?tapRefer="+tapRefer,"");
+	}
+}
+
+function addStorge(version){
+	localStorage.setItem("popup_bx_"+version, "A")
+}
+
+
+function mySysIsIos(){
+	return !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+}

+ 7 - 3
src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -9,7 +9,7 @@ var SuperSearch = {
 	s_words:  "",
 	myHistory:  "",
 	msgset:  "",
-	dyDiv: true,     //显示订阅剑鱼信息
+	dyDiv: true,     //显示订阅剑鱼标讯信息
 	subtype_proposed: "拟建",
 	requesting: false,
 	noMoreCache: false,
@@ -57,7 +57,9 @@ var SuperSearch = {
 		setTimeout(function(){
 			$("#supersearchPage").removeClass("absolute-hide");
 		},0);
-		JyObj.hiddenBottom("0");
+		try{
+			JyObj.hiddenBottom("0");
+		}catch(e){}
         $("body").css("background-color","#fff");
 		if(SuperSearch.dyDiv){   //首次进来是否显示订阅
 			$("#supersearchPage .resbm").addClass("hidden");
@@ -494,7 +496,9 @@ var SuperSearch = {
 		$("#supersearchPage #wrapper").removeClass("hidden");
 		$("#supersearchPage .selLable").removeClass("hidden");
 		SuperSearch.setUpLastPage();
-		JyObj.hiddenBottom("0");
+		try{
+			JyObj.hiddenBottom("0");
+		}catch(e){}
 	},
 	resetPage: function(flag){
 		this.showNull = null;

BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/logo_new.png


+ 1 - 1
src/jfw/modules/app/src/web/templates/_err.html

@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>剑鱼----网页错误</title>
+<title>剑鱼标讯----网页错误</title>
 {{include "/common/meta.html"}}
 <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 <link href="/jyapp/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">

+ 1 - 1
src/jfw/modules/app/src/web/templates/_error.html

@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>剑鱼----网页错误</title>
+<title>剑鱼标讯----网页错误</title>
 {{include "/common/meta.html"}}
 <script>
 	var s="%d,%s,%d,%s,%s,%s";

+ 1 - 1
src/jfw/modules/app/src/web/templates/followent/list.html

@@ -181,7 +181,7 @@ function afterReceivePushMessage(type,url){
 			<div id="addDiv" style="background-color: #2cb7ca;color: #FFFFFF;line-height:45px;margin-left: 15px;margin-right: 15px;border-radius: 3px;font-size: 18px;">+ 添加关注的企业</div>
 		</div>
 		<div class="tip" style="margin-top: 10px;display: none">
-			<img src="/jyapp/followent/images/wx/jyprompt.png">剑鱼提示:<front>可关注{{.T.followEntLimit}}个企业</front>
+			<img src="/jyapp/followent/images/wx/jyprompt.png">剑鱼标讯提示:<front>可关注{{.T.followEntLimit}}个企业</front>
 		</div>
 		<div class="jylistbottom" style="display: none;">
 			<img src="/jyapp/followent/images/wx/jydustbin.png"/>批量移除30天无更新企业

+ 3 - 3
src/jfw/modules/app/src/web/templates/me/download.html

@@ -2,7 +2,7 @@
 	<head>
 		{{include "/common/meta.html"}}
 		<script src="/jyapp/js/rem.js?v={{Msg "seo" "version"}}" type="text/javascript" charset="utf-8"></script>
-		<title>剑鱼招标订阅</title>
+		<title>剑鱼标讯</title>
 	</head>
 	<style type="text/css">
 		body{
@@ -88,8 +88,8 @@
 		{{if eq .T.from "weixin"}}
 			<img class="bg" src="/jyapp/images/download-backage-weixin.jpg"/>
 		{{else}}
-			<img class="bg" src="/jyapp/images/download-backage.jpg"/>
-			<img class="jyicon" src="/jyapp/images/jyicon.png"/>
+			<img class="bg" src="/jyapp/images/download-backage_new.png"/>
+			<img class="jyicon" src="/jyapp/images/jyicon_new.png"/>
 		{{end}}
 		<div class="download">
 			<a href="/front/downloadJyApp?page=app_download&source={{.T.source}}&code={{.T.code}}" id="download">立即下载App</a>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/index.html

@@ -8,7 +8,7 @@
 	<script src="/jyapp/js/jquery.js?v={{Msg "seo" "version"}}" type="text/javascript" charset="utf-8"></script>
 	<script src="/jyapp/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/js.html"}}
-	<title>剑鱼标</title>
+	<title>剑鱼标</title>
 </head>
 <body>
 	<div class="app-layout-header">

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/login.html

@@ -13,7 +13,7 @@
 <body>
 	<div id="header">
 		<a href="javascript:;" class="cancle"><span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>返回</a>
-		<h2>欢迎使用剑鱼</h2>
+		<h2>欢迎使用剑鱼标讯</h2>
 	</div>
 	<span class="header-tab">
 		<a class="header-tab-active">密码登录</a>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/notice.html

@@ -120,7 +120,7 @@
 						html+='<img src="/jyapp/me/images/mesnotice.png"/>'
 					}
 				}else{
-					html+='<img src="/jyapp/me/images/logo.png"/>'
+					html+='<img src="/jyapp/me/images/logo_new.png"/>'
 				}
 				html += '</div>'
 							+'<div class="noticeListRight">'

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/pushMsgSet.html

@@ -25,7 +25,7 @@
 					<strong>接收推送消息</strong>
 					<i class="messageClose">未开启</i>
 				</a>
-				<span class="warning">开启后,才可以收到剑鱼推送给您的招标信息</span>
+				<span class="warning">开启后,才可以收到剑鱼标讯推送给您的招标信息</span>
 				<a class="modifyPass hide" id="openSysNotice">
 					<strong>点击前往“设置”-“通知”中进行修改</strong>
 					<span class="jyapp-icon jyapp-icon-youjiantou"> </span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/register.html

@@ -16,7 +16,7 @@
 		
 	<div id="header">
 		<a href="javascript:;" class="cancle">取消</a>
-		<h2>欢迎加入剑鱼</h2>
+		<h2>欢迎加入剑鱼标讯</h2>
 	</div>
 
 		<div class="register">

+ 2 - 2
src/jfw/modules/app/src/web/templates/me/set.html

@@ -45,7 +45,7 @@
 					</li>
 					<li>
 						<a class="modifyPass">
-							<strong>关于剑鱼</strong>
+							<strong>关于剑鱼标讯</strong>
 							<span class="jyapp-icon jyapp-icon-youjiantou"></span>
 						</a>
 					</li>
@@ -159,7 +159,7 @@
 			if(shareType !=2 && {{session "i_type"}} == 2){
 				title += {{session "s_nickname"}};	
 			}
-			title += "向您推荐了剑鱼招标订阅";
+			title += "向您推荐了剑鱼标讯";
 			var content = "全国招标信息免费看,不遮挡";
 			if(shareType == 3){
 				title = getShareText();

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/setpwd.html

@@ -19,7 +19,7 @@
 			<a href="javascript:;" class="cancle">
 				<span class="jyapp-icon jyapp-icon-zuojiantou" style="font-size:0.4rem;"></span>
 			</a>
-			<h2>欢迎加入剑鱼</h2>
+			<h2>欢迎加入剑鱼标讯</h2>
 		</div>
 
 		<div class="takeIn">

+ 20 - 20
src/jfw/modules/app/src/web/templates/me/solveWay.html

@@ -13,44 +13,44 @@
 		推送消息设置
 	</div>
 	<div class="app-layout-content-b" style="padding: 15px;">
-	   <h4 style="margin:17pt 0pt 16.5pt; orphans:0; page-break-after:avoid; page-break-inside:avoid; text-align:center; widows:0"><span style="font-family:宋体; font-size:15pt; font-weight:bold">安卓手机收不到剑鱼推送通知的解决方法</span></h4>
+	   <h4 style="margin:17pt 0pt 16.5pt; orphans:0; page-break-after:avoid; page-break-inside:avoid; text-align:center; widows:0"><span style="font-family:宋体; font-size:15pt; font-weight:bold">安卓手机收不到剑鱼标讯推送通知的解决方法</span></h4>
 	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">安卓手机用户有时会出现收不到推送通知的问题,主要由两种情况可能导致此问题:</span></p>
-	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">1</span><span style="font-family:宋体; font-size:10.5pt">、手机上安装的各类安全软件把</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:宋体; font-size:10.5pt">的提醒给屏蔽了;</span></p>
-	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">2</span><span style="font-family:宋体; font-size:10.5pt">、手机系统设置里关闭了</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:宋体; font-size:10.5pt">的相关推送通知设置;</span></p>
-	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">如您遇到收不到</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:宋体; font-size:10.5pt">推送通知的问题,请依次使用以下方法步骤尝试解决。</span></p>
-	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">一、确保安全软件中赋予</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:宋体; font-size:10.5pt">提醒权限,并把</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:宋体; font-size:10.5pt">设置为自启动。</span></p>
+	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">1</span><span style="font-family:宋体; font-size:10.5pt">、手机上安装的各类安全软件把</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:宋体; font-size:10.5pt">的提醒给屏蔽了;</span></p>
+	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">2</span><span style="font-family:宋体; font-size:10.5pt">、手机系统设置里关闭了</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:宋体; font-size:10.5pt">的相关推送通知设置;</span></p>
+	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">如您遇到收不到</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:宋体; font-size:10.5pt">推送通知的问题,请依次使用以下方法步骤尝试解决。</span></p>
+	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">一、确保安全软件中赋予</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:宋体; font-size:10.5pt">提醒权限,并把</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:宋体; font-size:10.5pt">设置为自启动。</span></p>
 	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">以下列举了</span><span style="font-family:Calibri; font-size:10.5pt">5</span><span style="font-family:宋体; font-size:10.5pt">种常用的安全软件的操作方法(其他版本或软件大同小异,可对比操作)。</span></p>
 	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">360</span><span style="font-family:宋体; font-size:10.5pt">卫士</span><span style="font-family:宋体; font-size:10.5pt">、</span><span style="font-family:宋体; font-size:10.5pt">猎豹清理大师</span><span style="font-family:宋体; font-size:10.5pt">、</span><span style="font-family:宋体; font-size:10.5pt">百度手机卫士</span><span style="font-family:宋体; font-size:10.5pt">、</span><span style="font-family:宋体; font-size:10.5pt">腾讯手机管家</span><span style="font-family:宋体; font-size:10.5pt">、</span><span style="font-family:Calibri; font-size:10.5pt">LBE</span><span style="font-family:宋体; font-size:10.5pt">安全大师</span></p>
-	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">二、确保手机系统设置开启了</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:宋体; font-size:10.5pt">的提醒权限</span></p>
+	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">二、确保手机系统设置开启了</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:宋体; font-size:10.5pt">的提醒权限</span></p>
 	   <p style="font-size:10.5pt; line-height:150%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">小米手机</span><span style="font-family:宋体; font-size:10.5pt">、</span><span style="font-family:宋体; font-size:10.5pt">华为手机</span><span style="font-family:宋体; font-size:10.5pt">、</span><span style="font-family:宋体; font-size:10.5pt">魅族手机</span><span style="font-family:宋体; font-size:10.5pt">、</span><span style="font-family:Calibri; font-size:10.5pt">VIVO</span><span style="font-family:宋体; font-size:10.5pt">手机</span><span style="font-family:宋体; font-size:10.5pt">、</span><span style="font-family:Calibri; font-size:10.5pt">OPPO</span><span style="font-family:宋体; font-size:10.5pt">手机</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt; font-weight:bold">360</span><span style="font-family:宋体; font-size:10.5pt; font-weight:bold">卫士</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">首页</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">点击右上角头像</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">清理加速设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">内存加速忽略白名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加内存忽略名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加。</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">首页</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">点击右上角头像</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">清理加速设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">内存加速忽略白名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加内存忽略名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加。</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt; font-weight:bold">猎豹清理大师</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">我</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">进程白名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">右上角添加</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加。</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">我</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">进程白名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">右上角添加</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加。</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt; font-weight:bold">百度手机卫士</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">首页</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">点击右上角头像</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">通用设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">手机加速白名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加内白名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">首页</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">点击右上角头像</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">通用设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">手机加速白名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加内白名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt; font-weight:bold">腾讯手机管家</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">首页</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">点击右上角头像</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">清理加速保护名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">加速保护名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">确定</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">首页</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">点击右上角头像</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">清理加速保护名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">加速保护名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">确定</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt; font-weight:bold">LBE</span><span style="font-family:宋体; font-size:10.5pt; font-weight:bold">安全大师</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">首页</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">一键清理白名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加白名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">勾选</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">首页</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">一键清理白名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">添加白名单</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">勾选</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt; font-weight:bold">小米手机</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">1</span><span style="font-family:宋体; font-size:10.5pt">、自启动管理:需要把应用加到【自启动管理】列表,否则杀进程或重新开机后进程无法开启</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">步骤</span><span style="font-family:Calibri; font-size:10.5pt">:</span><span style="font-family:宋体; font-size:10.5pt">打开安全中心</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">授权管理</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">自启动管理</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">允许</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">2</span><span style="font-family:宋体; font-size:10.5pt">、通知栏设置:应用默认都是显示通知栏通知,如果关闭,则收到通知也不会提示</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">通知和状态栏</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">通知管理</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">允许</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">3</span><span style="font-family:宋体; font-size:10.5pt">、神隐模式:一定要把</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:宋体; font-size:10.5pt">要设置为 无限制。否则</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:宋体; font-size:10.5pt">可能由于被电量管理程序杀掉进程。导致</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:宋体; font-size:10.5pt">进入后台运行时,应用无法正常接收消息。</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-</span><span style="font-family:宋体; font-size:10.5pt">》其他高级设置 </span><span style="font-family:Calibri; font-size:10.5pt">-&gt; </span><span style="font-family:宋体; font-size:10.5pt">电量和性能 </span><span style="font-family:Calibri; font-size:10.5pt">-&gt; </span><span style="font-family:宋体; font-size:10.5pt">神隐模式 </span><span style="font-family:Calibri; font-size:10.5pt">-&gt; </span><span style="font-family:宋体; font-size:10.5pt">应用配置 </span><span style="font-family:Calibri; font-size:10.5pt">&gt; </span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:宋体; font-size:10.5pt"> </span><span style="font-family:Calibri; font-size:10.5pt">-&gt; </span><span style="font-family:宋体; font-size:10.5pt">无限制</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">通知和状态栏</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">通知管理</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">允许</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">3</span><span style="font-family:宋体; font-size:10.5pt">、神隐模式:一定要把</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:宋体; font-size:10.5pt">要设置为 无限制。否则</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:宋体; font-size:10.5pt">可能由于被电量管理程序杀掉进程。导致</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:宋体; font-size:10.5pt">进入后台运行时,应用无法正常接收消息。</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-</span><span style="font-family:宋体; font-size:10.5pt">》其他高级设置 </span><span style="font-family:Calibri; font-size:10.5pt">-&gt; </span><span style="font-family:宋体; font-size:10.5pt">电量和性能 </span><span style="font-family:Calibri; font-size:10.5pt">-&gt; </span><span style="font-family:宋体; font-size:10.5pt">神隐模式 </span><span style="font-family:Calibri; font-size:10.5pt">-&gt; </span><span style="font-family:宋体; font-size:10.5pt">应用配置 </span><span style="font-family:Calibri; font-size:10.5pt">&gt; </span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:宋体; font-size:10.5pt"> </span><span style="font-family:Calibri; font-size:10.5pt">-&gt; </span><span style="font-family:宋体; font-size:10.5pt">无限制</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt; font-weight:bold">华为手机</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">1</span><span style="font-family:宋体; font-size:10.5pt">、自启动管理: 需要把应用加到【自启动管理】列表,否则杀进程或重新开机后进程不会开启,只能手动开启应用</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">步骤</span><span style="font-family:Calibri; font-size:10.5pt">:</span><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">全部设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">开机自动启动</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">允许</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">步骤</span><span style="font-family:Calibri; font-size:10.5pt">:</span><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">全部设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">开机自动启动</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">允许</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">2</span><span style="font-family:宋体; font-size:10.5pt">、后台应用保护:需要手动把应用加到此列表,否则设备进入睡眠后会自动杀掉应用进程,只有手动开启应用才能恢复运行</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">步骤</span><span style="font-family:Calibri; font-size:10.5pt">:</span><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">全部设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">受保护的后台应用</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">开启</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; text-indent:0pt; widows:0"><span style="font-family:Calibri; font-size:10.5pt">3</span><span style="font-family:宋体; font-size:10.5pt">、</span><span style="font-family:宋体; font-size:10.5pt">通知管理:设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">全部设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">通知中心</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">允许通知</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">步骤</span><span style="font-family:Calibri; font-size:10.5pt">:</span><span style="font-family:宋体; font-size:10.5pt">设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">全部设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">受保护的后台应用</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">开启</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; text-indent:0pt; widows:0"><span style="font-family:Calibri; font-size:10.5pt">3</span><span style="font-family:宋体; font-size:10.5pt">、</span><span style="font-family:宋体; font-size:10.5pt">通知管理:设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">全部设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">通知中心</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">允许通知</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt; font-weight:bold">魅族手机</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">1</span><span style="font-family:宋体; font-size:10.5pt">、自启动管理:需要把应用加到【自启动管理】列表,否则杀进程或重新开机后进程无法开启</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">步骤</span><span style="font-family:Calibri; font-size:10.5pt">:</span><span style="font-family:宋体; font-size:10.5pt">自带手机管家</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">权限管理</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">自启动管理</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">允许</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">步骤</span><span style="font-family:Calibri; font-size:10.5pt">:</span><span style="font-family:宋体; font-size:10.5pt">自带手机管家</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">权限管理</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">自启动管理</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">允许</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">2</span><span style="font-family:宋体; font-size:10.5pt">、通知栏推送:关闭应用通知则收到消息不会有任何展示</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">步骤</span><span style="font-family:Calibri; font-size:10.5pt">:</span><span style="font-family:宋体; font-size:10.5pt">自带手机管家</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">权限管理</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">通知管理</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">允许</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">步骤</span><span style="font-family:Calibri; font-size:10.5pt">:</span><span style="font-family:宋体; font-size:10.5pt">自带手机管家</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">权限管理</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">通知管理</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">允许</span><span style="font-family:Calibri; font-size:10.5pt">.</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">3</span><span style="font-family:宋体; font-size:10.5pt">、省电管理: 安全中心里设置省电模式,在【待机耗电管理】中允许应用待机时,保持允许,否则手机休眠或者应用闲置一段时间,无法正常接收消息。</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt; font-weight:bold">VIVO</span><span style="font-family:宋体; font-size:10.5pt; font-weight:bold">手机</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">1</span><span style="font-family:宋体; font-size:10.5pt">、内存一键清理:需要将应用加入【白名单】列表,否则系统自带的“一键加速”,会杀掉进程</span></p>
@@ -60,7 +60,7 @@
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">1.</span><span style="font-family:宋体; font-size:10.5pt">冻结应用管理:需要将应用加入纯净后台,否则锁屏状态下无法及时收到消息</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">2.</span><span style="font-family:宋体; font-size:10.5pt">自启动管理:将应用加入【自启动管理】列表的同时,还需要到设置</span><span style="font-family:Calibri; font-size:10.5pt">-</span><span style="font-family:宋体; font-size:10.5pt">应用程序</span><span style="font-family:Calibri; font-size:10.5pt">-</span><span style="font-family:宋体; font-size:10.5pt">正在运行里锁定应用进程,</span></p>
 	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:宋体; font-size:10.5pt">否则杀进程或者开机后进程不会开启,只能手动开启应用。</span></p>
-	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">ColorOS 2.X</span><span style="font-family:宋体; font-size:10.5pt">版本</span><span style="font-family:宋体; font-size:10.5pt">点</span><span style="font-family:宋体; font-size:10.5pt">击 设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">通知中心</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼招标订阅</span><span style="font-family:宋体; font-size:10.5pt"> ,开启 允许 通知 即可。</span></p>
+	   <p style="font-size:10.5pt; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0"><span style="font-family:Calibri; font-size:10.5pt">ColorOS 2.X</span><span style="font-family:宋体; font-size:10.5pt">版本</span><span style="font-family:宋体; font-size:10.5pt">点</span><span style="font-family:宋体; font-size:10.5pt">击 设置</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">通知中心</span><span style="font-family:Calibri; font-size:10.5pt">-&gt;</span><span style="font-family:宋体; font-size:10.5pt">剑鱼标讯</span><span style="font-family:宋体; font-size:10.5pt"> ,开启 允许 通知 即可。</span></p>
 	</div>
  </body>
 </html>

+ 9 - 9
src/jfw/modules/app/src/web/templates/weixin/about.html

@@ -1,7 +1,7 @@
 <html>
 	<head>
 		{{include "/common/meta.html"}}
-		<title>关于剑鱼</title>
+		<title>关于剑鱼标讯</title>
 		<link href="/jyapp/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<link href="/jyapp/css/wx_about.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<script type="text/javascript" src="/jyapp/js/jquery.js"></script>
@@ -11,7 +11,7 @@
 <body>
 <div class="app-layout-header">
 	<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-	关于剑鱼
+	关于剑鱼标讯
 </div>
 <div class="app-layout-content-b">
 	<div class="screen_2">
@@ -20,7 +20,7 @@
 				<a class="linecircle_line"></a>
 				<a class="linecircle_circle"></a>
 			</span>
-			剑鱼招标订阅
+			剑鱼标讯
 			<span class="linecircle">
 				<a class="linecircle_circle"></a>
 				<a class="linecircle_line"></a>
@@ -63,7 +63,7 @@
 			<li>
 				<div><b>自上线以来</b></div>
 				<div>
-					剑鱼招标订阅为用户成功推送了<br>
+					剑鱼标讯为用户成功推送了<br>
 					<font class="i_push">5164398</font>条信息
 				</div>
 				<span></span>
@@ -71,7 +71,7 @@
 			<li>
 				<div><b>最近三十天</b></div>
 				<div>
-					剑鱼招标订阅从<font class="i_site">419</font>个招标网站
+					剑鱼标讯从<font class="i_site">419</font>个招标网站
 					<br>
 					收录了<font class="i_bidmonth">799229</font>条信息
 					<!--<br>
@@ -82,7 +82,7 @@
 			<li>
 				<div><b>今天</b></div>
 				<div>
-					剑鱼招标订阅成功为用户推送了
+					剑鱼标讯成功为用户推送了
 					<br><font class="i_bidtoday">28177</font>条信息
 				</div>
 			</li>
@@ -135,7 +135,7 @@
 					<a class="linecircle_line"></a>
 					<a class="linecircle_circle"></a>
 				</span>
-				剑鱼开放平台
+				剑鱼标讯开放平台
 				<span class="linecircle">
 					<a class="linecircle_circle"></a>
 					<a class="linecircle_line"></a>
@@ -150,7 +150,7 @@
 			</ul>
 		</div>
 		<img src="/jyapp/images/about/bg_4.jpg">
-		<center class="tip">电脑访问剑鱼官网<font>www.jianyu360.com</font>查看详情</center>
+		<center class="tip">电脑访问剑鱼标讯官网<font>www.jianyu360.com</font>查看详情</center>
 		<center class="phone">客服电话:400-108-6670</center>
 	</div>
 	<div class="screen_5">
@@ -346,7 +346,7 @@ $(function(){
 		if(shareType !=2 && {{session "i_type"}} == 2){
 			title += {{session "s_nickname"}};	
 		}
-		title += "向您推荐了剑鱼招标订阅";
+		title += "向您推荐了剑鱼标讯";
 		var content = "全国招标信息免费看,不遮挡";
 		if(shareType == 3){
 			title = getShareText();

+ 2 - 2
src/jfw/modules/app/src/web/templates/weixin/feedback.html

@@ -390,7 +390,7 @@ $(function(){
 		$.ajax({
 			type: "POST",
 			url: "/jyapp/member/swordfish/ajaxReq",
-			data:{reqType:"feedback",value:value,fkid:{{.T.fkid}},title:"剑鱼app-意见反馈",source:document.referrer,fromName:{{.T.fromName}}},
+			data:{reqType:"feedback",value:value,fkid:{{.T.fkid}},title:"剑鱼标讯app-意见反馈",source:document.referrer,fromName:{{.T.fromName}}},
 			dataType: "json",
 			success: function(r){
 				if(r.flag == "y"){
@@ -398,7 +398,7 @@ $(function(){
 					$(".feedback-nav").removeClass("hide");
 					hasLoadMyFeedbacks = false;
 					$("#hasNoDatas").hide();
-					EasyAlert.show("您的意见已经收到,稍后剑鱼会给您答复,谢谢!",{width:"180px"},3000);
+					EasyAlert.show("您的意见已经收到,稍后剑鱼标讯会给您答复,谢谢!",{width:"180px"},3000);
 				}else{
 					EasyAlert.show("提交失败!");
 					$("button").removeAttr("disabled");

+ 1 - 1
src/jfw/modules/app/src/web/templates/weixin/follow/list.html

@@ -237,7 +237,7 @@ function afterReceivePushMessage(type,url){
 		<div class="divbtn"{{if .T.datas}}{{if eq (len .T.datas) 10}} disabled="disabled"{{end}}{{end}}><img class="jybtnimg" src="/jyapp/images/wx/jyaddfw.png"/></div>
 		<div class="limit"></div>
 		<div class="tip">
-			<img src="/jyapp/images/wx/jyprompt.png">剑鱼提示:<front>可关注{{.T.followLimit}}个项目</front>
+			<img src="/jyapp/images/wx/jyprompt.png">剑鱼标讯提示:<front>可关注{{.T.followLimit}}个项目</front>
 		</div>
 	<div class="jylistbottom">
 		<img src="/jyapp/images/wx/jydustbin.png"/>批量移除30天无更新项目

+ 2 - 2
src/jfw/modules/app/src/web/templates/weixin/jylab/lab-cjss.html

@@ -8,7 +8,7 @@
 		<script type="text/javascript" src="/jyapp/js/jquery-3.2.1.min.js"></script>
 		<script type="text/javascript" src="/jyapp/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
 		{{include "/common/js.html"}}
-		<title>剑鱼实验室</title>
+		<title>剑鱼标讯实验室</title>
 	</head>
 	<body>
 		<div class="app-layout-header">
@@ -19,7 +19,7 @@
 			<!--开关文字弹出层-->
 			<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden{{end}}{{end}}" style="display:none;">
 				<div class="popup-top">
-					实验功能逐步完善中。实验随时可能结束,或者进行调整,请密切关注剑鱼通知。
+					实验功能逐步完善中。实验随时可能结束,或者进行调整,请密切关注剑鱼标讯通知。
 				</div>
 				<div class="popup-bottom" style="display:none;">
 					我知道了

+ 3 - 3
src/jfw/modules/app/src/web/templates/weixin/jylab/lab-gzqy.html

@@ -8,7 +8,7 @@
 		<script type="text/javascript" src="/jyapp/js/jquery-3.2.1.min.js"></script>
 		<script type="text/javascript" src="/jyapp/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
 		{{include "/common/js.html"}}
-		<title>剑鱼实验室</title>
+		<title>剑鱼标讯实验室</title>
 	</head>
 	<body>
 		<div class="app-layout-header">
@@ -19,7 +19,7 @@
 			<!--开关文字弹出层-->
 			<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden {{end}}{{end}}" style="display:none;">
 				<div class="popup-top">
-					实验功能逐步完善中。实验随时可能结束,或者进行调整,请密切关注剑鱼通知。
+					实验功能逐步完善中。实验随时可能结束,或者进行调整,请密切关注剑鱼标讯通知。
 				</div>
 				<div class="popup-bottom" style="display:none;">
 					我知道了
@@ -59,7 +59,7 @@
 						</div>
 						<div id="box2" class="box">
 							<div class="iner-text">
-								您关注了某个企业以后,该企业一旦有项目中标,您将第一时间收到剑鱼的通知消息。可以输入企业名称加关注,也可以从招标信息页面将页面上出现的企业添加关注。
+								您关注了某个企业以后,该企业一旦有项目中标,您将第一时间收到剑鱼标讯的通知消息。可以输入企业名称加关注,也可以从招标信息页面将页面上出现的企业添加关注。
 							</div>
 						</div>
 						<div class="hd">

+ 3 - 3
src/jfw/modules/app/src/web/templates/weixin/jylab/lab-index.html

@@ -7,7 +7,7 @@
 	<script src="/jyapp/js/jquery-3.2.1.min.js"></script>
 	<script src="/jyapp/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/js.html"}}
-	<title>剑鱼实验室</title>
+	<title>剑鱼标讯实验室</title>
 </head>
 <style type="text/css">
 body{
@@ -23,8 +23,8 @@ body{
 		<section id="sys-main">
 			<!--头部-->
 			<section class="header-text">
-				<h3>欢迎体验剑鱼实验室</h3>
-				<p>这里有剑鱼正在探索的功能,</br>欢迎体验并向我们反馈您的感受和建议!</p>
+				<h3>欢迎体验剑鱼标讯实验室</h3>
+				<p>这里有剑鱼标讯正在探索的功能,</br>欢迎体验并向我们反馈您的感受和建议!</p>
 				<p><img src="/jyapp/images/syzindex/sys-cap.png" alt="" />可参与的实验</p>
 			</section>
 			<!--列表-->

+ 3 - 3
src/jfw/modules/app/src/web/templates/weixin/jylab/lab-sjdc.html

@@ -8,7 +8,7 @@
 		<script type="text/javascript" src="/jyapp/js/jquery-3.2.1.min.js"></script>
 		<script type="text/javascript" src="/jyapp/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
 		{{include "/common/js.html"}}
-		<title>剑鱼实验室</title>
+		<title>剑鱼标讯实验室</title>
 	</head>
 	<body>
 		<div class="app-layout-header">
@@ -19,7 +19,7 @@
 			<!--开关文字弹出层-->
 			<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden{{end}}{{end}}">
 				<div class="popup-top">
-					实验功能逐步完善中。实验随时可能结束,或者进行调整,请密切关注剑鱼通知。
+					实验功能逐步完善中。实验随时可能结束,或者进行调整,请密切关注剑鱼标讯通知。
 				</div>
 				<div class="popup-bottom" style="display:none;">
 					我知道了
@@ -57,7 +57,7 @@
 						</div>
 						<div id="box2" class="box">
 							<div class="iner-text">
-								剑鱼向您推送多条信息时,将附带一个电子信息表格,这个表格可以将信息更清晰地呈现给您,您也可以将其导入到Excel中进行统计汇总。
+								剑鱼标讯向您推送多条信息时,将附带一个电子信息表格,这个表格可以将信息更清晰地呈现给您,您也可以将其导入到Excel中进行统计汇总。
 							</div>
 						</div>
 						<div class="hd">

+ 2 - 2
src/jfw/modules/app/src/web/templates/weixin/jylab/lab-zbqy.html

@@ -8,7 +8,7 @@
 		<script type="text/javascript" src="/jyapp/js/jquery-3.2.1.min.js"></script>
 		<script type="text/javascript" src="/jyapp/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
 		{{include "/common/js.html"}}
-		<title>剑鱼实验室</title>
+		<title>剑鱼标讯实验室</title>
 	</head>
 	<body>
 		<div class="app-layout-header">
@@ -19,7 +19,7 @@
 			<!--开关文字弹出层-->
 			<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden{{end}}{{end}}" style="display:none;">
 				<div class="popup-top">
-					实验功能逐步完善中。实验随时可能结束,或者进行调整,请密切关注剑鱼通知。
+					实验功能逐步完善中。实验随时可能结束,或者进行调整,请密切关注剑鱼标讯通知。
 				</div>
 				<div class="popup-bottom" style="display:none;">
 					我知道了

+ 3 - 3
src/jfw/modules/app/src/web/templates/weixin/jylab/lab-zndy.html

@@ -8,7 +8,7 @@
 		<script type="text/javascript" src="/jyapp/js/jquery-3.2.1.min.js"></script>
 		<script type="text/javascript" src="/jyapp/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
 		{{include "/common/js.html"}}
-		<title>剑鱼实验室</title>
+		<title>剑鱼标讯实验室</title>
 	</head>
 	<body>
 		<div class="app-layout-header">
@@ -19,7 +19,7 @@
 			<!--开关文字弹出层-->
 			<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden {{end}}{{end}}">
 				<div class="popup-top">
-					实验功能逐步完善中。实验随时可能结束,或者进行调整,请密切关注剑鱼通知。
+					实验功能逐步完善中。实验随时可能结束,或者进行调整,请密切关注剑鱼标讯通知。
 				</div>
 				<div class="popup-bottom" style="display:none;">
 					我知道了
@@ -59,7 +59,7 @@
 						</div>
 						<div id="box2" class="box">
 							<div class="iner-text">
-								如果您打开“智能订阅模式”,除了将关键词与公告标题匹配,剑鱼还将更智能的与公告正文进行匹配。比如您订阅了关键词“路由器”,一般路由器是与其他设备合并在一个项目里采购,很少有项目单独采购路由器,使用智能匹配模式,您就可以收到采购内容包含了“路由器”的招标公告信息,无论公告标题有没有包含“路由器”。如果公告正文中列举了采购内容,剑鱼将与采购内容匹配,否则,将与正文全文匹配。您打开智能订阅模式情况下,添加排除词,排除词匹配全文。
+								如果您打开“智能订阅模式”,除了将关键词与公告标题匹配,剑鱼标讯还将更智能的与公告正文进行匹配。比如您订阅了关键词“路由器”,一般路由器是与其他设备合并在一个项目里采购,很少有项目单独采购路由器,使用智能匹配模式,您就可以收到采购内容包含了“路由器”的招标公告信息,无论公告标题有没有包含“路由器”。如果公告正文中列举了采购内容,剑鱼标讯将与采购内容匹配,否则,将与正文全文匹配。您打开智能订阅模式情况下,添加排除词,排除词匹配全文。
 							</div>
 						</div>
 						<div class="hd">

+ 9 - 4
src/jfw/modules/app/src/web/templates/weixin/messagedetail.html

@@ -173,21 +173,26 @@ function execShare(thisIndex){
 	if(shareType !=2 && {{session "i_type"}} == 2){
 		content += {{session "s_nickname"}};	
 	}
-	content += "向您推荐了剑鱼招标订阅";
+	content += "向您推荐了剑鱼标讯";
 	var link = window.location.href;
-	if(shareType != 2){
-		link = window.location.href.replace("/jyapp/","/");
+	//if(shareType != 2){
+		link = window.location.href.replace("/jyapp/","/").replace("res.","");
 		if(link.indexOf("?") == -1){
 			link += "?";
 		}else{
 			link += "&";
 		}
 		link += "source=app_infocontentshare";
-	}
+	//}
 	JyObj.share(shareType,{{.T.data.s_title}},content,link);
 }
 ///////////////////////
 $(function(){
+	var tapRefer = {{.T.tapRefer}}
+	if(tapRefer!=null&&tapRefer=="N"){
+		$(".app-back").hide();
+		$(".header-share").hide();
+	}
 	//
 	$(".content").find("a").click(function(){
 		JyObj.openExternalLink($(this).attr("href"),"消息通知");

+ 1 - 1
src/jfw/modules/app/src/web/templates/weixin/privacy.html

@@ -173,7 +173,7 @@ function execShare(thisIndex){
 	if(shareType !=2 && {{session "i_type"}} == 2){
 		content += {{session "s_nickname"}};	
 	}
-	content += "向您推荐了剑鱼招标订阅";
+	content += "向您推荐了剑鱼标讯";
 	var link = window.location.href;
 	if(shareType != 2){
 		link = window.location.href.replace("/jyapp/","/");

+ 17 - 5
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -15,6 +15,8 @@
 <script src="/jyapp/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="/jyapp/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="/jyapp/js/popup/tap.js?v={{Msg "seo" "version"}}"></script>
 <title>搜索</title>
 <script type="text/javascript">
 	var userId = {{session "userId"}};
@@ -102,7 +104,7 @@
 				</div>
 			</div>		
 			<div id="intercept" class="hidden">
-				<img src="/jyapp/images/tip.png"><font>“的方式”</font>及其后面的字词均被忽略,因为剑鱼的查询限制在20个汉字以内。
+				<img src="/jyapp/images/tip.png"><font>“的方式”</font>及其后面的字词均被忽略,因为剑鱼标讯的查询限制在20个汉字以内。
 			</div>
 			<div class="wxsearch hidden" id="super_search">
 				<div class="jysstj">
@@ -160,6 +162,7 @@
 								<li>
 									<span>A</span>
 									<button class="btn">安徽</button>
+									<button class="btn">澳门</button>
 								</li>
 								<li>
 									<span>B</span>
@@ -219,11 +222,13 @@
 								<li>
 									<span>T</span>
 									<button class="btn">天津</button>
+									<button class="btn">台湾</button>
 								</li>
 								<li>
 									<span>X</span>
 									<button class="btn">西藏</button>
 									<button class="btn">新疆</button>
+									<button class="btn">香港</button>
 								</li>
 								<li>
 									<span>Y</span>
@@ -305,7 +310,7 @@
 	                        -->
 	                    </table>
 	                </div>
-					<div class="TableTip" id="TableTip" style="display:none;"><img class="tableclose" src="/jyapp/images/table_close.png"><div class="TableText">推荐使用电脑浏览器访问剑鱼网站<br>jianyu360.com查看数据表格,体验更佳。</div></div>
+					<div class="TableTip" id="TableTip" style="display:none;"><img class="tableclose" src="/jyapp/images/table_close.png"><div class="TableText">推荐使用电脑浏览器访问剑鱼标讯网站<br>jianyu360.com查看数据表格,体验更佳。</div></div>
 				</div>
 				<div class="resbm hidden">
 					<div class="rests">如果您对以上结果满意可</div>
@@ -315,7 +320,7 @@
 				</div>
 			</div>
 		</div>
-		<div id="working" class="hidden" style="text-align: center;position: absolute;top: 50%;left: 50%;margin-left: -81px;margin-top: -50px;"><img style="width:163px;" src="/jyapp/images/wx/working.gif"><div style="font-size:16px;">剑鱼正在努力工作中···</div></div>
+		<div id="working" class="hidden" style="text-align: center;position: absolute;top: 50%;left: 50%;margin-left: -81px;margin-top: -50px;"><img style="width:163px;" src="/jyapp/images/wx/working.gif"><div style="font-size:16px;">剑鱼标讯正在努力工作中···</div></div>
 		<div class="nullcontent text-center  hidden">
 			<div>
 				<img style="width:163px;margin:60px 0px 50px 0px;" src="/jyapp/images/wx/jysorry_1.png">
@@ -405,6 +410,7 @@
 								<li>
 									<span>A</span>
 									<button class="btn">安徽</button>
+									<button class="btn">澳门</button>
 								</li>
 								<li>
 									<span>B</span>
@@ -464,11 +470,13 @@
 								<li>
 									<span>T</span>
 									<button class="btn">天津</button>
+									<button class="btn">台湾</button>
 								</li>
 								<li>
 									<span>X</span>
 									<button class="btn">西藏</button>
 									<button class="btn">新疆</button>
+									<button class="btn">香港</button>
 								</li>
 								<li>
 									<span>Y</span>
@@ -509,7 +517,7 @@
 			</section>
 			</div>
 			<!--tip-->
-			<div class="tip_m">提示:为了获得更佳的体验,推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>
+			<div class="tip_m">提示:为了获得更佳的体验,推荐使用电脑浏览器访问剑鱼标讯网站jianyu360.com查看数据表格。</div>
 		</div>
 		<!--no data-->
 		<div class="nullcontent text-center hidden">
@@ -524,6 +532,8 @@
 	</div>
 </section>
 <!--{{include "/common/footer.html"}}-->
+
+
 {{$s:=(Ad "jyapp-wxsearch-middle" -1)}}
 {{if $s}}
 <div id="advertscript" class="hidden">
@@ -561,6 +571,9 @@
 </div>
 {{end}}
 <script type="text/javascript">
+	if(sessionStorage.onceTipUpdate != "1"){
+		localStorage.removeItem("onceTipUpdate");
+	}
 	if(sessionStorage&&sessionStorage.mainSearchReload=="1"){
 		sessionStorage.removeItem("mainSearchReload");
 		SuperSearch.clearSessionStorage();
@@ -669,7 +682,6 @@
 		}else if(sessionStorage.searchpageName == "lab_ent_back"){
 			EntSearch.init(true,false,false);
 		}else{
-			localStorage.removeItem("onceTipUpdate");
 			localStorage.removeItem("superSearch_showType");
 			if(localStorage.reLogin=="1"){
 				localStorage.removeItem("reLogin");

+ 3 - 3
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -798,7 +798,7 @@ function execShare(thisIndex){
 	if(shareType !=2 && {{session "i_type"}} == 2){
 		content += {{session "s_nickname"}};	
 	}
-	content += "向您推荐了剑鱼招标订阅";
+	content += "向您推荐了剑鱼标讯";
 	var link = "{{Msg "seo" "ZBADDRESS"}}/swordfish/about?source=app_infocontentshare";
 	var shareTitle = {{.T.obj.title}};
 	shareTitle=shareTitle.replace(/<\/?.+?>/g,"");
@@ -1076,7 +1076,7 @@ $(function(){
 	$("body").show();
 	//打赏成功提示
 	if(sessionStorage && sessionStorage.rewardStatus == 1){
-		EasyAlert.show("剑鱼感谢您的支持",{},3000);
+		EasyAlert.show("剑鱼标讯感谢您的支持",{},3000);
 		sessionStorage.removeItem("rewardStatus");
 	}
 	{{if .T.obj.projectinfo.attachments}}
@@ -1344,7 +1344,7 @@ $(function(){
 			$.ajax({
 			type: "POST",
 			url: "/jyapp/member/swordfish/ajaxReq",
-			data:{reqType:"feedback",value:val,fkid:{{.T.obj._id}},title:"剑鱼app-快照页意见反馈",source:window.location.href},
+			data:{reqType:"feedback",value:val,fkid:{{.T.obj._id}},title:"剑鱼标讯app-快照页意见反馈",source:window.location.href},
 			dataType: "json",
 			success: function(r){
 				if(r.flag == "y"){

+ 3 - 0
src/jfw/modules/app/src/web/templates/weixin/wxkeyset/area.html

@@ -175,6 +175,7 @@ function saveData(flag){
 				<li>
 					<span>A</span>
 					<button class="btn">安徽</button>
+					<button class="btn">澳门</button>
 				</li>
 				<li>
 					<span>B</span>
@@ -234,11 +235,13 @@ function saveData(flag){
 				<li>
 					<span>T</span>
 					<button class="btn">天津</button>
+					<button class="btn">台湾</button>
 				</li>
 				<li>
 					<span>X</span>
 					<button class="btn">西藏</button>
 					<button class="btn">新疆</button>
+					<button class="btn">香港</button>
 				</li>
 				<li>
 					<span>Y</span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/weixin/wxkeyset/index.html

@@ -674,7 +674,7 @@ function hideTip() {
 		</div>
 		<!--关键词上方红字提示-->
 		<div class="keyWordTip" style="display: none; position:relative; padding:5px 0px 5px 15px; background-color:rgba(253,238,210,1);">
-			<div style="width:90%; font-size:13px; color:rgba(216,86,27,1);">在推送设置中,开启智能订阅模式,剑鱼将更智能地与公告正文进行匹配。</div>
+			<div style="width:90%; font-size:13px; color:rgba(216,86,27,1);">在推送设置中,开启智能订阅模式,剑鱼标讯将更智能地与公告正文进行匹配。</div>
 			<img src="/jyapp/images/wxkeyset/zhaobiaodingyue-close.png" style="position:absolute; top:16px; right:10px; width:18px; height:18px;" onclick="hideTip();">
 		</div>
 	

+ 1 - 1
src/jfw/modules/app/src/web/templates/weixin/wxkeyset/seniorset.html

@@ -54,7 +54,7 @@
 <script>
 var email = "";
 var haskeyword = {{.T.haskeyword}};
-var keepOneTipWayMsg = "请保留一种推送方式,<br>剑鱼还要推送信息给您";
+var keepOneTipWayMsg = "请保留一种推送方式,<br>剑鱼标讯还要推送信息给您";
 var scflog = true;
 var def1 = 0;
 var def2 = 24;

+ 4 - 4
src/jfw/modules/app/src/web/templates/weixin/wxtsguide.html

@@ -46,11 +46,11 @@ if(localStorage && localStorage.tsGuide_status == "1"){
 		<div class="step-2">
 			<div class="com-top-one">
 				<div class="t-desc">
-					“剑鱼招标订阅”囊括了全国范围内、全行业的招标信息。您设置了订阅关键词之后,剑鱼会第一时间向您推送匹配关键词的最新招标信息。<img class="jy_help" src="/jyapp/images/help-b.png"/>
+					“剑鱼标讯”囊括了全国范围内、全行业的招标信息。您设置了订阅关键词之后,剑鱼标讯会第一时间向您推送匹配关键词的最新招标信息。<img class="jy_help" src="/jyapp/images/help-b.png"/>
 				</div>
 				<input type="text" placeholder="在这里输入关键词" id="input-keyword-1">
 				<div class="b-desc">
-					比如您输入“绿化工程”以后,当某招标人发布了《某某县中心敬老院一期观景<font class="keyword">绿化工程</font>施工》,剑鱼就会把这条信息推送给您。
+					比如您输入“绿化工程”以后,当某招标人发布了《某某县中心敬老院一期观景<font class="keyword">绿化工程</font>施工》,剑鱼标讯就会把这条信息推送给您。
 				</div>
 				<div class="btnarea">
 					<button type="button" class="btn" onclick="Guide.skip()">跳过向导</button>
@@ -68,7 +68,7 @@ if(localStorage && localStorage.tsGuide_status == "1"){
 				<div class="com-top-two-b">
 					<div class="com-division"></div>
 					<div class="com-top-two-d">
-						您还可以继续添加更多关键词。如果您订阅了多个关键词,新的招标信息只要匹配了其中任意一个,剑鱼都会将其推送给您。
+						您还可以继续添加更多关键词。如果您订阅了多个关键词,新的招标信息只要匹配了其中任意一个,剑鱼标讯都会将其推送给您。
 						<div class="margin-t-10">如果您不需要更多关键词,可以直接点击“下一步”按钮。</div>
 						<div class="input-icon">
 							<input type="text" id="input-keyword-2">
@@ -104,7 +104,7 @@ if(localStorage && localStorage.tsGuide_status == "1"){
 					<button type="button" class="btn btn-normal prevStep" onclick="Guide.prevStep(4)">上一步</button>
 					<button type="button" class="btn nextStep" onclick="Guide.skip()">开始使用</button>
 				</span>
-				<font>点击开始使用后,剑鱼会为您打开订阅设置页面</font>
+				<font>点击开始使用后,剑鱼标讯会为您打开订阅设置页面</font>
 			</div>
 			<center class="findnull">
 				<img src="/jyapp/images/wx/jysorry.png">

+ 40 - 40
src/jfw/modules/entsesearch/src/seo.json

@@ -2,14 +2,14 @@
 	"cdn":"",
     "qfw": {
         "swordfish": {
-            "description": "剑鱼招标订阅为用户提供个性化定制的全行业招标信息订阅推送服务,用户只需微信关注剑鱼招标订阅并合理设定招标关键词,无需下载APP,即可实现海量招标信息智能推送。",
-            "key": "剑鱼招标订阅,招标订阅,招标推送,招标信息,招标公告,中标公告",
-            "title": "剑鱼招标订阅,全行业招标信息智能推送领导者!"
+            "description": "剑鱼标讯为用户提供个性化定制的全行业招标信息订阅推送服务,用户只需微信关注剑鱼标讯并合理设定招标关键词,无需下载APP,即可实现海量招标信息智能推送。",
+            "key": "剑鱼标讯,招标订阅,招标推送,招标信息,招标公告,中标公告",
+            "title": "剑鱼标讯,全行业招标信息智能推送领导者!"
         },
 		"swordfishsl": {
-            "description": "剑鱼招标订阅搜索功能依据用户输入的招标关键词,快速展现最新最全的行业招标信息搜索结果,招标公告与中标公告,一应俱全。",
-            "key": "招标搜索结果,招标搜索,剑鱼招标订阅",
-            "title": "招标搜索结果_剑鱼招标订阅,全行业招标信息智能推送领导者!"
+            "description": "剑鱼标讯搜索功能依据用户输入的招标关键词,快速展现最新最全的行业招标信息搜索结果,招标公告与中标公告,一应俱全。",
+            "key": "招标搜索结果,招标搜索,剑鱼标讯",
+            "title": "招标搜索结果_剑鱼标讯,全行业招标信息智能推送领导者!"
         }
     },
 	"version":"1401",
@@ -178,89 +178,89 @@
 	},
 	"stype":{
 		"NJ":{	"NAME":"拟建",
-				"TITLE":"拟建项目_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"拟建项目_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"拟建项目,拟在建项目,拟建项目网,拟建项目信息",
-				"DESCRIPTION":"剑鱼招标订阅拟建项目专栏,包含国家发改委和各部委提供的尚处于前期立项、审批阶段的招投标项目,各供应商应在立项阶段就开始掌握最新的项目信息,做到早介入,早准备,稳拿单。"
+				"DESCRIPTION":"剑鱼标讯拟建项目专栏,包含国家发改委和各部委提供的尚处于前期立项、审批阶段的招投标项目,各供应商应在立项阶段就开始掌握最新的项目信息,做到早介入,早准备,稳拿单。"
 			},
 		"YG":{	"NAME":"预告",
-				"TITLE":"招标预告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"招标预告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"招标预告,招标预告信息,招标预公告",
-				"DESCRIPTION":"剑鱼招标订阅招标预告栏目,每天发布国内最新的招标预告信息,提供各行业招标预告信息的搜索查询服务,不仅及时准确,而且更加专业。"
+				"DESCRIPTION":"剑鱼标讯招标预告栏目,每天发布国内最新的招标预告信息,提供各行业招标预告信息的搜索查询服务,不仅及时准确,而且更加专业。"
 			},
 		"ZB":{	"NAME":"招标",
-				"TITLE":"公开招标_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"公开招标_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"公开招标,公开招标信息,公开招标公告,公开招标网",
-				"DESCRIPTION":"剑鱼招标订阅公开招标栏目,提供国内各行业最新最全的公开招标信息,出色的搜索查询服务,可以让用户更加快速高效的获取想要的信息。"
+				"DESCRIPTION":"剑鱼标讯公开招标栏目,提供国内各行业最新最全的公开招标信息,出色的搜索查询服务,可以让用户更加快速高效的获取想要的信息。"
 			},
 		"YB":{	"NAME":"邀标",
-				"TITLE":"邀请招标_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"邀请招标_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"邀请招标,邀请招标信息,邀请招标公告",
-				"DESCRIPTION":"剑鱼招标订阅邀请招标栏目,及时准确的提供国内各行业最新的邀请招标信息,出色的搜索查询服务,可以让用户更加高效的获取想要的信息。"
+				"DESCRIPTION":"剑鱼标讯邀请招标栏目,及时准确的提供国内各行业最新的邀请招标信息,出色的搜索查询服务,可以让用户更加高效的获取想要的信息。"
 			},
 		"XJ":{	"NAME":"询价",
-				"TITLE":"询价采购_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"询价采购_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"询价采购,询价采购信息,询价采购公告",
-				"DESCRIPTION":"获取全国各行业最新的询价采购信息,就来剑鱼招标订阅询价采购专栏,数据多而全,搜索查询更全面,专业性更高。"
+				"DESCRIPTION":"获取全国各行业最新的询价采购信息,就来剑鱼标讯询价采购专栏,数据多而全,搜索查询更全面,专业性更高。"
 			},
 		"JT":{	"NAME":"竞谈",
-				"TITLE":"竞争性谈判_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"竞争性谈判_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"竞争性谈判,竞争性谈判采购,竞争性谈判信息,竞争性谈判公告",
-				"DESCRIPTION":"剑鱼招标订阅竞争性谈判栏目,专业为广大用户提供国内各省、各行业最新的竞争性谈判采购信息和查询服务。招标数据每天保持更新,及时而且准确。"
+				"DESCRIPTION":"剑鱼标讯竞争性谈判栏目,专业为广大用户提供国内各省、各行业最新的竞争性谈判采购信息和查询服务。招标数据每天保持更新,及时而且准确。"
 			},
 		"DY":{	"NAME":"单一",
-				"TITLE":"单一来源_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"单一来源_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"单一来源,单一来源采购,单一来源信息,单一来源采购公告",
-				"DESCRIPTION":"剑鱼招标订阅单一来源栏目,包含国内各省、各行业最新的单一来源采购公告,使用招标搜索功能,可以帮助用户更快速的获取这些信息。"
+				"DESCRIPTION":"剑鱼标讯单一来源栏目,包含国内各省、各行业最新的单一来源采购公告,使用招标搜索功能,可以帮助用户更快速的获取这些信息。"
 			},
 		"JJ":{	"NAME":"竞价",
-				"TITLE":"公开竞价_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"公开竞价_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"公开竞价,网上竞价,公开竞价信息,公开竞价采购",
-				"DESCRIPTION":"剑鱼招标订阅公开竞价专栏,提供全国各省和更行业最新的公开竞价信息,你想看的这里都有,使用公开竞价的搜索查询服务更省心。"
+				"DESCRIPTION":"剑鱼标讯公开竞价专栏,提供全国各省和更行业最新的公开竞价信息,你想看的这里都有,使用公开竞价的搜索查询服务更省心。"
 			},
 		"BG":{	"NAME":"变更",
-				"TITLE":"变更公告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"变更公告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"变更公告,更正公告,变更公告信息,招标变更公告",
-				"DESCRIPTION":"变更公告是招标公告发布后,针对该公告的的地址、时间、招标内容等信息的变更通知。及时查询和获取全国最新的变更公告,就在剑鱼招标订阅变更公告专栏。"
+				"DESCRIPTION":"变更公告是招标公告发布后,针对该公告的的地址、时间、招标内容等信息的变更通知。及时查询和获取全国最新的变更公告,就在剑鱼标讯变更公告专栏。"
 			},
 		"ZHB":{	"NAME":"中标",
-				"TITLE":"中标公示_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"中标公示_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"中标公示,中标公示信息,中标公告结果,中标公示网",
-				"DESCRIPTION":"剑鱼招标订阅中标公示栏目,涵盖全国各省各行业最新的中标公示信息,可以帮助用户轻松查询到想看的中标信息,好用又省心。"
+				"DESCRIPTION":"剑鱼标讯中标公示栏目,涵盖全国各省各行业最新的中标公示信息,可以帮助用户轻松查询到想看的中标信息,好用又省心。"
 			},
 		"CJ":{	"NAME":"成交",
-				"TITLE":"成交公告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"成交公告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"成交公告,成交公告信息,成交结果,成交结果公告",
-				"DESCRIPTION":"剑鱼招标订阅成交公告栏目,提供专业的成交公告查询,成交结果查看等功能,全国各省和各个行业的成交公告信息都可以查看和查询。"
+				"DESCRIPTION":"剑鱼标讯成交公告栏目,提供专业的成交公告查询,成交结果查看等功能,全国各省和各个行业的成交公告信息都可以查看和查询。"
 			},
 		"FB":{	"NAME":"废标",
-				"TITLE":"废标公告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"废标公告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"废标公告,废标公告信息,终止公告",
-				"DESCRIPTION":"剑鱼招标订阅废标公告栏目,提供全国各省,各行业最新的废标公告信息,出色的废标公告查询功能,支持多条件筛选,使用更简单。"
+				"DESCRIPTION":"剑鱼标讯废标公告栏目,提供全国各省,各行业最新的废标公告信息,出色的废标公告查询功能,支持多条件筛选,使用更简单。"
 			},
 		"LB":{	"NAME":"流标",
-				"TITLE":"流标公告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"流标公告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"流标公告,流标公示,招标失败公告,采购失败公告",
-				"DESCRIPTION":"剑鱼招标订阅流标公告栏目,帮助用户准确获取和查询最新的流标公告信息,提前掌握招投标的进展情况,工作更轻松。"
+				"DESCRIPTION":"剑鱼标讯流标公告栏目,帮助用户准确获取和查询最新的流标公告信息,提前掌握招投标的进展情况,工作更轻松。"
 			},
 		"HT":{	"NAME":"合同",
-				"TITLE":"合同公告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"合同公告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"合同公告,合同公告信息,采购合同公告",
-				"DESCRIPTION":"剑鱼招标订阅合同公告专栏,包含当前国内各省和各行业最全面的合同公告信息,使用合同公告搜索查询功能,获取信息更快更准确。"
+				"DESCRIPTION":"剑鱼标讯合同公告专栏,包含当前国内各省和各行业最全面的合同公告信息,使用合同公告搜索查询功能,获取信息更快更准确。"
 			},
 		"YS":{	"NAME":"验收",
-				"TITLE":"验收公告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"验收公告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"验收公告,验收公告信息,验收项目",
-				"DESCRIPTION":"剑鱼招标订阅验收公告专栏,涵盖当前国内各省和各行业最全面的验收公告信息,使用验收公告搜索查询功能,获取信息更快更准确。"
+				"DESCRIPTION":"剑鱼标讯验收公告专栏,涵盖当前国内各省和各行业最全面的验收公告信息,使用验收公告搜索查询功能,获取信息更快更准确。"
 			},
 		"WG":{	"NAME":"违规",
-				"TITLE":"违规处理_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"违规处理_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"违规处理,违规处理信息,违规招投标",
-				"DESCRIPTION":"剑鱼招标订阅违规处理栏目,每天汇总全国招投标行业最新的违规处理信息,搜索查询功能可以让用户更全面的了解招投标违规信息。"
+				"DESCRIPTION":"剑鱼标讯违规处理栏目,每天汇总全国招投标行业最新的违规处理信息,搜索查询功能可以让用户更全面的了解招投标违规信息。"
 			},
 		"QT":{	"NAME":"其它",
-				"TITLE":"其他招标信息_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"其他招标信息_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"结果公告,土地拍卖,国有产权拍卖,矿权拍卖",
-				"DESCRIPTION":"剑鱼招标订阅其他信息专栏为您提供招投标项目的结果公告,土地拍卖信息、国有产权拍卖信息和矿权拍卖信息等内容,让你更详细、更全面的了解所有招投标信息。"
+				"DESCRIPTION":"剑鱼标讯其他信息专栏为您提供招投标项目的结果公告,土地拍卖信息、国有产权拍卖信息和矿权拍卖信息等内容,让你更详细、更全面的了解所有招投标信息。"
 			}
 	},
 	"jyadd":"http://127.0.0.1",

+ 1 - 1
src/jfw/modules/entsesearch/src/web/staticres/jylab/entsesearch/js/login.js

@@ -250,7 +250,7 @@ var processpage = function(shareid,num){
 				},500);
 			}
 			break;
-		case "15"://15剑鱼博客页面
+		case "15"://15剑鱼标讯博客页面
 			break;
 		case "16"://关于我们页面16
 			break;

+ 4 - 4
src/jfw/modules/entsesearch/src/web/staticres/jylab/entsesearch/wxswordfish/share.js

@@ -14,10 +14,10 @@ function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 		    signature: signature[3],// 必填,签名,见附录1
 		    jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage'] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
 		});
-		var title="第一时间精准推送招标信息,就在剑鱼招标订阅";
-		var title1="第一时间精准推送招标信息,就在剑鱼招标订阅";
+		var title="第一时间精准推送招标信息,就在剑鱼标讯";
+		var title1="第一时间精准推送招标信息,就在剑鱼标讯";
 		var link=myloc+"/swordfish/shareabout/"+openid+"__"+activecode;
-		var desc="关注微信并设置剑鱼关键词,全国招标信息统统推送给您!";
+		var desc="关注微信并设置剑鱼标讯关键词,全国招标信息统统推送给您!";
 		var url = "/wxswordfish/images/small_log.jpg";
 		var encryptid = "";
 		var subhref = window.location.href;
@@ -53,7 +53,7 @@ function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 				title1=desc;
 			}else if (isentry==2){
 				if(nickname!=""){
-					desc = '您的朋友'+nickname+'向您推荐了剑鱼招标订阅!';
+					desc = '您的朋友'+nickname+'向您推荐了剑鱼标讯!';
 				}
 				if(avatar!=""){
 					url = avatar;

+ 1 - 1
src/jfw/modules/entsesearch/src/web/templates/weixin/entseSearch.html

@@ -584,7 +584,7 @@
 	</section>
 	</div>
 	<!--tip-->
-	<div class="tip_m">提示:为了获得更佳的体验,推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>
+	<div class="tip_m">提示:为了获得更佳的体验,推荐使用电脑浏览器访问剑鱼标讯网站jianyu360.com查看数据表格。</div>
 </div>
 <!--no data-->
 <div class="nullcontent text-center  hidden">

+ 40 - 40
src/jfw/modules/followent/src/seo.json

@@ -2,14 +2,14 @@
 	"cdn":"",
     "qfw": {
         "swordfish": {
-            "description": "剑鱼招标订阅为用户提供个性化定制的全行业招标信息订阅推送服务,用户只需微信关注剑鱼招标订阅并合理设定招标关键词,无需下载APP,即可实现海量招标信息智能推送。",
-            "key": "剑鱼招标订阅,招标订阅,招标推送,招标信息,招标公告,中标公告",
-            "title": "剑鱼招标订阅,全行业招标信息智能推送领导者!"
+            "description": "剑鱼标讯为用户提供个性化定制的全行业招标信息订阅推送服务,用户只需微信关注剑鱼标讯并合理设定招标关键词,无需下载APP,即可实现海量招标信息智能推送。",
+            "key": "剑鱼标讯,招标订阅,招标推送,招标信息,招标公告,中标公告",
+            "title": "剑鱼标讯,全行业招标信息智能推送领导者!"
         },
 		"swordfishsl": {
-            "description": "剑鱼招标订阅搜索功能依据用户输入的招标关键词,快速展现最新最全的行业招标信息搜索结果,招标公告与中标公告,一应俱全。",
-            "key": "招标搜索结果,招标搜索,剑鱼招标订阅",
-            "title": "招标搜索结果_剑鱼招标订阅,全行业招标信息智能推送领导者!"
+            "description": "剑鱼标讯搜索功能依据用户输入的招标关键词,快速展现最新最全的行业招标信息搜索结果,招标公告与中标公告,一应俱全。",
+            "key": "招标搜索结果,招标搜索,剑鱼标讯",
+            "title": "招标搜索结果_剑鱼标讯,全行业招标信息智能推送领导者!"
         }
     },
 	"version":"1401",
@@ -178,89 +178,89 @@
 	},
 	"stype":{
 		"NJ":{	"NAME":"拟建",
-				"TITLE":"拟建项目_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"拟建项目_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"拟建项目,拟在建项目,拟建项目网,拟建项目信息",
-				"DESCRIPTION":"剑鱼招标订阅拟建项目专栏,包含国家发改委和各部委提供的尚处于前期立项、审批阶段的招投标项目,各供应商应在立项阶段就开始掌握最新的项目信息,做到早介入,早准备,稳拿单。"
+				"DESCRIPTION":"剑鱼标讯拟建项目专栏,包含国家发改委和各部委提供的尚处于前期立项、审批阶段的招投标项目,各供应商应在立项阶段就开始掌握最新的项目信息,做到早介入,早准备,稳拿单。"
 			},
 		"YG":{	"NAME":"预告",
-				"TITLE":"招标预告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"招标预告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"招标预告,招标预告信息,招标预公告",
-				"DESCRIPTION":"剑鱼招标订阅招标预告栏目,每天发布国内最新的招标预告信息,提供各行业招标预告信息的搜索查询服务,不仅及时准确,而且更加专业。"
+				"DESCRIPTION":"剑鱼标讯招标预告栏目,每天发布国内最新的招标预告信息,提供各行业招标预告信息的搜索查询服务,不仅及时准确,而且更加专业。"
 			},
 		"ZB":{	"NAME":"招标",
-				"TITLE":"公开招标_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"公开招标_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"公开招标,公开招标信息,公开招标公告,公开招标网",
-				"DESCRIPTION":"剑鱼招标订阅公开招标栏目,提供国内各行业最新最全的公开招标信息,出色的搜索查询服务,可以让用户更加快速高效的获取想要的信息。"
+				"DESCRIPTION":"剑鱼标讯公开招标栏目,提供国内各行业最新最全的公开招标信息,出色的搜索查询服务,可以让用户更加快速高效的获取想要的信息。"
 			},
 		"YB":{	"NAME":"邀标",
-				"TITLE":"邀请招标_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"邀请招标_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"邀请招标,邀请招标信息,邀请招标公告",
-				"DESCRIPTION":"剑鱼招标订阅邀请招标栏目,及时准确的提供国内各行业最新的邀请招标信息,出色的搜索查询服务,可以让用户更加高效的获取想要的信息。"
+				"DESCRIPTION":"剑鱼标讯邀请招标栏目,及时准确的提供国内各行业最新的邀请招标信息,出色的搜索查询服务,可以让用户更加高效的获取想要的信息。"
 			},
 		"XJ":{	"NAME":"询价",
-				"TITLE":"询价采购_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"询价采购_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"询价采购,询价采购信息,询价采购公告",
-				"DESCRIPTION":"获取全国各行业最新的询价采购信息,就来剑鱼招标订阅询价采购专栏,数据多而全,搜索查询更全面,专业性更高。"
+				"DESCRIPTION":"获取全国各行业最新的询价采购信息,就来剑鱼标讯询价采购专栏,数据多而全,搜索查询更全面,专业性更高。"
 			},
 		"JT":{	"NAME":"竞谈",
-				"TITLE":"竞争性谈判_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"竞争性谈判_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"竞争性谈判,竞争性谈判采购,竞争性谈判信息,竞争性谈判公告",
-				"DESCRIPTION":"剑鱼招标订阅竞争性谈判栏目,专业为广大用户提供国内各省、各行业最新的竞争性谈判采购信息和查询服务。招标数据每天保持更新,及时而且准确。"
+				"DESCRIPTION":"剑鱼标讯竞争性谈判栏目,专业为广大用户提供国内各省、各行业最新的竞争性谈判采购信息和查询服务。招标数据每天保持更新,及时而且准确。"
 			},
 		"DY":{	"NAME":"单一",
-				"TITLE":"单一来源_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"单一来源_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"单一来源,单一来源采购,单一来源信息,单一来源采购公告",
-				"DESCRIPTION":"剑鱼招标订阅单一来源栏目,包含国内各省、各行业最新的单一来源采购公告,使用招标搜索功能,可以帮助用户更快速的获取这些信息。"
+				"DESCRIPTION":"剑鱼标讯单一来源栏目,包含国内各省、各行业最新的单一来源采购公告,使用招标搜索功能,可以帮助用户更快速的获取这些信息。"
 			},
 		"JJ":{	"NAME":"竞价",
-				"TITLE":"公开竞价_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"公开竞价_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"公开竞价,网上竞价,公开竞价信息,公开竞价采购",
-				"DESCRIPTION":"剑鱼招标订阅公开竞价专栏,提供全国各省和更行业最新的公开竞价信息,你想看的这里都有,使用公开竞价的搜索查询服务更省心。"
+				"DESCRIPTION":"剑鱼标讯公开竞价专栏,提供全国各省和更行业最新的公开竞价信息,你想看的这里都有,使用公开竞价的搜索查询服务更省心。"
 			},
 		"BG":{	"NAME":"变更",
-				"TITLE":"变更公告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"变更公告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"变更公告,更正公告,变更公告信息,招标变更公告",
-				"DESCRIPTION":"变更公告是招标公告发布后,针对该公告的的地址、时间、招标内容等信息的变更通知。及时查询和获取全国最新的变更公告,就在剑鱼招标订阅变更公告专栏。"
+				"DESCRIPTION":"变更公告是招标公告发布后,针对该公告的的地址、时间、招标内容等信息的变更通知。及时查询和获取全国最新的变更公告,就在剑鱼标讯变更公告专栏。"
 			},
 		"ZHB":{	"NAME":"中标",
-				"TITLE":"中标公示_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"中标公示_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"中标公示,中标公示信息,中标公告结果,中标公示网",
-				"DESCRIPTION":"剑鱼招标订阅中标公示栏目,涵盖全国各省各行业最新的中标公示信息,可以帮助用户轻松查询到想看的中标信息,好用又省心。"
+				"DESCRIPTION":"剑鱼标讯中标公示栏目,涵盖全国各省各行业最新的中标公示信息,可以帮助用户轻松查询到想看的中标信息,好用又省心。"
 			},
 		"CJ":{	"NAME":"成交",
-				"TITLE":"成交公告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"成交公告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"成交公告,成交公告信息,成交结果,成交结果公告",
-				"DESCRIPTION":"剑鱼招标订阅成交公告栏目,提供专业的成交公告查询,成交结果查看等功能,全国各省和各个行业的成交公告信息都可以查看和查询。"
+				"DESCRIPTION":"剑鱼标讯成交公告栏目,提供专业的成交公告查询,成交结果查看等功能,全国各省和各个行业的成交公告信息都可以查看和查询。"
 			},
 		"FB":{	"NAME":"废标",
-				"TITLE":"废标公告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"废标公告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"废标公告,废标公告信息,终止公告",
-				"DESCRIPTION":"剑鱼招标订阅废标公告栏目,提供全国各省,各行业最新的废标公告信息,出色的废标公告查询功能,支持多条件筛选,使用更简单。"
+				"DESCRIPTION":"剑鱼标讯废标公告栏目,提供全国各省,各行业最新的废标公告信息,出色的废标公告查询功能,支持多条件筛选,使用更简单。"
 			},
 		"LB":{	"NAME":"流标",
-				"TITLE":"流标公告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"流标公告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"流标公告,流标公示,招标失败公告,采购失败公告",
-				"DESCRIPTION":"剑鱼招标订阅流标公告栏目,帮助用户准确获取和查询最新的流标公告信息,提前掌握招投标的进展情况,工作更轻松。"
+				"DESCRIPTION":"剑鱼标讯流标公告栏目,帮助用户准确获取和查询最新的流标公告信息,提前掌握招投标的进展情况,工作更轻松。"
 			},
 		"HT":{	"NAME":"合同",
-				"TITLE":"合同公告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"合同公告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"合同公告,合同公告信息,采购合同公告",
-				"DESCRIPTION":"剑鱼招标订阅合同公告专栏,包含当前国内各省和各行业最全面的合同公告信息,使用合同公告搜索查询功能,获取信息更快更准确。"
+				"DESCRIPTION":"剑鱼标讯合同公告专栏,包含当前国内各省和各行业最全面的合同公告信息,使用合同公告搜索查询功能,获取信息更快更准确。"
 			},
 		"YS":{	"NAME":"验收",
-				"TITLE":"验收公告_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"验收公告_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"验收公告,验收公告信息,验收项目",
-				"DESCRIPTION":"剑鱼招标订阅验收公告专栏,涵盖当前国内各省和各行业最全面的验收公告信息,使用验收公告搜索查询功能,获取信息更快更准确。"
+				"DESCRIPTION":"剑鱼标讯验收公告专栏,涵盖当前国内各省和各行业最全面的验收公告信息,使用验收公告搜索查询功能,获取信息更快更准确。"
 			},
 		"WG":{	"NAME":"违规",
-				"TITLE":"违规处理_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"违规处理_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"违规处理,违规处理信息,违规招投标",
-				"DESCRIPTION":"剑鱼招标订阅违规处理栏目,每天汇总全国招投标行业最新的违规处理信息,搜索查询功能可以让用户更全面的了解招投标违规信息。"
+				"DESCRIPTION":"剑鱼标讯违规处理栏目,每天汇总全国招投标行业最新的违规处理信息,搜索查询功能可以让用户更全面的了解招投标违规信息。"
 			},
 		"QT":{	"NAME":"其它",
-				"TITLE":"其他招标信息_剑鱼招标订阅,全行业招标信息智能推送领导者!",
+				"TITLE":"其他招标信息_剑鱼标讯,全行业招标信息智能推送领导者!",
 				"KEYWORDS":"结果公告,土地拍卖,国有产权拍卖,矿权拍卖",
-				"DESCRIPTION":"剑鱼招标订阅其他信息专栏为您提供招投标项目的结果公告,土地拍卖信息、国有产权拍卖信息和矿权拍卖信息等内容,让你更详细、更全面的了解所有招投标信息。"
+				"DESCRIPTION":"剑鱼标讯其他信息专栏为您提供招投标项目的结果公告,土地拍卖信息、国有产权拍卖信息和矿权拍卖信息等内容,让你更详细、更全面的了解所有招投标信息。"
 			}
 	},
 	"jyadd":"http://127.0.0.1",

+ 4 - 4
src/jfw/modules/followent/src/web/staticres/jylab/followent/wxswordfish/share.js

@@ -18,10 +18,10 @@ function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 		    signature: signature[3],// 必填,签名,见附录1
 		    jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage'] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
 		});
-		var title="第一时间精准推送招标信息,就在剑鱼招标订阅";
-		var title1="第一时间精准推送招标信息,就在剑鱼招标订阅";
+		var title="第一时间精准推送招标信息,就在剑鱼标讯";
+		var title1="第一时间精准推送招标信息,就在剑鱼标讯";
 		var link=myloc+"/swordfish/shareabout/"+openid+"__"+activecode;
-		var desc="关注微信并设置剑鱼关键词,全国招标信息统统推送给您!";
+		var desc="关注微信并设置剑鱼标讯关键词,全国招标信息统统推送给您!";
 		var url = "/wxswordfish/images/small_log.jpg";
 		var encryptid = "";
 		var subhref = window.location.href;
@@ -57,7 +57,7 @@ function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 				title1=desc;
 			}else if (isentry==2){
 				if(nickname!=""){
-					desc = '您的朋友'+nickname+'向您推荐了剑鱼招标订阅!';
+					desc = '您的朋友'+nickname+'向您推荐了剑鱼标讯!';
 				}
 				if(avatar!=""){
 					url = avatar;

+ 13 - 13
src/jfw/modules/followent/src/web/templates/_error.html

@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>剑鱼----网页错误</title>
+<title>剑鱼标讯----网页错误</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 <meta name="renderer" content="webkit">
 <script src="/js/jquery.js"></script>
@@ -154,7 +154,7 @@ $(function(){
 	<div class="j-head">
 		<div class="j-nav">
 			<ul>
-				<li class="j-nav-logo" onclick="window.location.href='/'" style="width:120px;"><a><img src="/images/swordfish/sf_01.png"></a></li>
+				<li class="j-nav-logo" onclick="window.location.href='/'" style="width:120px;"><a><img src="/images/swordfish/sf_01_new.png"></a></li>
 				<li class="navigation">
 				<form method="post" action="/swordfish/searchinfolist.html" id="zbSeatchIndex">
 	            <span style="position:relative" class="j-inputgroup">
@@ -171,7 +171,7 @@ $(function(){
 					<div class='useronline' id="login"></div>
 				</li>
 	<!--			<li class="jy_scancode"  ><img src="/wxswordfish/images/QR.gif"/><a>微信扫一扫</a></li>-->
-	<!--			<li class="j-nav-link" id="jy_blog"><a href="/jyblog/index.html">剑鱼博客</a></li>-->
+	<!--			<li class="j-nav-link" id="jy_blog"><a href="/jyblog/index.html">剑鱼标讯博客</a></li>-->
 				<li class="j-nav-link" data-toggle="modal" data-target="#bidcommunity"><a>招标社区</a></li>
 				<li class="j-nav-link" onclick="window.location.href='/swordfish/searchinfolist.html'">
 				<a class="newhead">招标搜索</a></li>
@@ -223,7 +223,7 @@ $(function(){
 	      <div class="modal-content">
 	         <div class="modal-header">
 	            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-	            <h4 class="modal-title">剑鱼</h4>
+	            <h4 class="modal-title">剑鱼标讯</h4>
 	         </div>
 	         <div class="modal-body text-center">
 				<span class="glyphicon qmx-icon-jingqingqidai2" style="font-size:60px;"></span>
@@ -239,11 +239,11 @@ $(function(){
 	      <div class="modal-content">
 	         <div class="modal-header">
 	            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-	            <h4 class="modal-title">剑鱼</h4>
+	            <h4 class="modal-title">剑鱼标讯</h4>
 	         </div>
 	         <div class="modal-body text-center" style="height: 270px;">
-				<img src="/front/share/RV8=" alt="剑鱼招标订阅微信公众号"><br/>
-				微信扫码关注剑鱼,进入招标社区参与互动
+				<img src="/front/share/RV8=" alt="剑鱼标讯微信公众号"><br/>
+				微信扫码关注剑鱼标讯,进入招标社区参与互动
 	         </div>
 	      </div>
 		</div>
@@ -254,10 +254,10 @@ $(function(){
       <div class="modal-content">
          <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">剑鱼</h4>
+            <h4 class="modal-title">剑鱼标讯</h4>
          </div>
          <div class="modal-body text-center" style="height: 270px;">
-			<img src="/front/share/{{.T.shareid}}" alt="剑鱼用户登录"><br/>
+			<img src="/front/share/{{.T.shareid}}" alt="剑鱼标讯用户登录"><br/>
 			微信扫描登录,新用户自动注册
          </div>
       </div>
@@ -517,7 +517,7 @@ function infoListCss(){
 				</div>
 			</div>
 			<div class="jy_renzheng">
-				<div class="jy_otherlink"><a href="/" target="_bank">剑鱼</a>|<a href="/swordfish/searchinfolist.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼博客</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
+				<div class="jy_otherlink"><a href="/" target="_bank">剑鱼标讯</a>|<a href="/swordfish/searchinfolist.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼标讯博客</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
 				<div style="color: #B9B9BB;" id="cpinfo">©2015-2016 jianyu360.com 版权所有 | 豫ICP备15016539号-2</div>
 			</div>
 		</div>
@@ -539,13 +539,13 @@ function infoListCss(){
 					<img src="/images/pc_10.png">
 				</span>
 			</form>
-			<div><a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="/">剑鱼招标订阅</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a>|<a href="http://www.qmx.top/front/web_A_help.html" target="_bank">关于我们</a>|<a href="http://www.qmx.top/front/web_H_help.html" target="_bank">帮助中心</a></div>
+			<div><a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="/">剑鱼标讯</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a>|<a href="http://www.qmx.top/front/web_A_help.html" target="_bank">关于我们</a>|<a href="http://www.qmx.top/front/web_H_help.html" target="_bank">帮助中心</a></div>
 			<div>©2015-2016 jianyu360.com 版权所有 | 豫ICP备15016539号-2</div>
 		</div>
 		<div class="j-bottom-b">
-			<img src="/front/share/RV8=" alt="剑鱼招标订阅微信公众号"><br>
+			<img src="/front/share/RV8=" alt="剑鱼标讯微信公众号"><br>
 			<font>微信扫一扫关注</font><br>
-			<font>或搜索公众号“剑鱼招标订阅”</font>
+			<font>或搜索公众号“剑鱼标讯”</font>
 		</div>
 	</div>
 </div>

+ 1 - 1
src/jfw/modules/followent/src/web/templates/weixin/list.html

@@ -180,7 +180,7 @@ initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avat
 		<div id="addDiv" style="background-color: #2cb7ca;color: #FFFFFF;line-height:45px;margin-left: 15px;margin-right: 15px;border-radius: 3px;font-size: 18px;">+ 添加关注的企业</div>
 	</div>
 	<div class="tip" style="margin-top: 10px;display: none">
-		<img src="/jylab/followent/images/wx/jyprompt.png">剑鱼提示:<front>可关注{{.T.followEntLimit}}个企业</front>
+		<img src="/jylab/followent/images/wx/jyprompt.png">剑鱼标讯提示:<front>可关注{{.T.followEntLimit}}个企业</front>
 	</div>
 	<div class="jylistbottom" style="display: none;">
 		<img src="/jylab/followent/images/wx/jydustbin.png"/>批量移除30天无更新企业

+ 4 - 4
src/jfw/modules/followent/src/web/wxswordfish/share.js

@@ -18,10 +18,10 @@ function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 		    signature: signature[3],// 必填,签名,见附录1
 		    jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage'] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
 		});
-		var title="第一时间精准推送招标信息,就在剑鱼招标订阅";
-		var title1="第一时间精准推送招标信息,就在剑鱼招标订阅";
+		var title="第一时间精准推送招标信息,就在剑鱼标讯";
+		var title1="第一时间精准推送招标信息,就在剑鱼标讯";
 		var link=myloc+"/swordfish/shareabout/"+openid+"__"+activecode;
-		var desc="关注微信并设置剑鱼关键词,全国招标信息统统推送给您!";
+		var desc="关注微信并设置剑鱼标讯关键词,全国招标信息统统推送给您!";
 		var url = "/wxswordfish/images/small_log.jpg";
 		var encryptid = "";
 		var subhref = window.location.href;
@@ -57,7 +57,7 @@ function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 				title1=desc;
 			}else if (isentry==2){
 				if(nickname!=""){
-					desc = '您的朋友'+nickname+'向您推荐了剑鱼招标订阅!';
+					desc = '您的朋友'+nickname+'向您推荐了剑鱼标讯!';
 				}
 				if(avatar!=""){
 					url = avatar;

+ 1 - 1
src/jfw/modules/pc/client/apple/bg.js

@@ -103,7 +103,7 @@ function InitTray(user) {
 		menu.popup(point.x, point.y);
 		return false
 	})
-	tray.tooltip = '剑鱼招标订阅';
+	tray.tooltip = '剑鱼标讯';
 	menu = new gui.Menu();
 	menu.append(new gui.MenuItem({
 		label: "  "+user,

+ 6 - 6
src/jfw/modules/pc/client/apple/login.html

@@ -5,12 +5,12 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 	<link rel="stylesheet" type="text/css" href="./css/reset.css" />
 	<link rel="stylesheet" type="text/css" href="./css/login.css"/>
-	<title>剑鱼招标订阅</title>
+	<title>剑鱼标讯</title>
 </head>
 <body>
 	<div id="header">
 		<!-- <img style="width:15%; margin-left: 15px" src="./img/logo2.png"> -->
-		<h2>欢迎使用剑鱼</h2>	
+		<h2>欢迎使用剑鱼标讯</h2>	
 		<h5>请微信扫码登录,或使用你在APP上注册的手机号登录</h5>
 	</div>
 	<span class="header-tab">
@@ -268,10 +268,10 @@
 				}
 			});
 			$("body").keydown(function() {
-	             if (event.keyCode == "13") {//keyCode=13是回车键
-	                 $('#btn').click();
-	             }
-	         });
+	             if (event.keyCode == "13") {//keyCode=13是回车键
+	                 $('#btn').click();
+	             }
+	         });
 			//点击登录显示报错弹窗
 			$("#btn").on("click",function(){
 				var phone = $.trim($("#tel").val());

+ 2 - 2
src/jfw/modules/pc/client/apple/package.json

@@ -1,5 +1,5 @@
 {
-	"name":"剑鱼招标订阅",
+	"name":"剑鱼标讯",
 	"main":"login.html",
 	"nodejs": "true",
 	"version": "2.5.1",    
@@ -7,7 +7,7 @@
 	"single-instance": true,  
 	"chromium-args":"--disable-devtools",
 	"window": {
-		"title": "剑鱼招标订阅",
+		"title": "剑鱼标讯",
 		"icon": "./img/myicon.png",
 	    "frame": true,
 		"show_in_taskbar":true,

+ 1 - 1
src/jfw/modules/pc/client/jynotify/bg.js

@@ -103,7 +103,7 @@ function InitTray(user) {
 		menu.popup(point.x, point.y);
 		return false
 	})
-	tray.tooltip = '剑鱼招标订阅';
+	tray.tooltip = '剑鱼标讯';
 	menu = new gui.Menu();
 	menu.append(new gui.MenuItem({
 		label: "  "+user,

+ 6 - 6
src/jfw/modules/pc/client/jynotify/login.html

@@ -5,12 +5,12 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 	<link rel="stylesheet" type="text/css" href="./css/reset.css" />
 	<link rel="stylesheet" type="text/css" href="./css/login.css"/>
-	<title>剑鱼招标订阅</title>
+	<title>剑鱼标讯</title>
 </head>
 <body>
 	<div id="header">
 		<!-- <img style="width:15%; margin-left: 15px" src="./img/logo2.png"> -->
-		<h2>欢迎使用剑鱼</h2>	
+		<h2>欢迎使用剑鱼标讯</h2>	
 		<h5>请微信扫码登录,或使用你在APP上注册的手机号登录</h5>
 	</div>
 	<span class="header-tab">
@@ -268,10 +268,10 @@
 				}
 			});
 			$("body").keydown(function() {
-	             if (event.keyCode == "13") {//keyCode=13是回车键
-	                 $('#btn').click();
-	             }
-	         });
+	             if (event.keyCode == "13") {//keyCode=13是回车键
+	                 $('#btn').click();
+	             }
+	         });
 			//点击登录显示报错弹窗
 			$("#btn").on("click",function(){
 				var phone = $.trim($("#tel").val());

+ 2 - 2
src/jfw/modules/pc/client/jynotify/package.json

@@ -1,5 +1,5 @@
 {
-	"name":"剑鱼招标订阅",
+	"name":"剑鱼标讯",
 	"main":"login.html",
 	"nodejs": "true",
 	"version": "2.5.1",    
@@ -7,7 +7,7 @@
 	"single-instance": true,  
 	"chromium-args":"--disable-devtools",
 	"window": {
-		"title": "剑鱼招标订阅",
+		"title": "剑鱼标讯",
 		"icon": "./img/myicon.png",
 	    "frame": true,
 		"show_in_taskbar":true,

+ 1 - 1
src/jfw/modules/portrait/src/web/staticres/portrait/login.js

@@ -490,7 +490,7 @@ var processpage = function(shareid,num){
 				},500);
 			}
 			break;
-		case "15"://15剑鱼博客页面
+		case "15"://15剑鱼标讯博客页面
 			break;
 		case "16"://关于我们页面16
 			break;

+ 4 - 4
src/jfw/modules/push/src/config.json

@@ -12,8 +12,8 @@
 	"elasticsearch": "http://192.168.3.18:9800",
 	"pushPoolSize": 60,
 	"mail_content": "<tr><td><num>%d</num></td><td><div class='tit'><a style='color: #000;text-decoration: none;' href='%s?mail' >%s</a></div></td><td style='float: right;' class='infos' ><span class='%s'>%s</span><span class='%s'>%s</span><span class='%s'>%s</span><span class='time'>%s</span></td></tr>",
-	"mail_html": "<body><style> *,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;} </style><div id='all'><div class='head'><IMG width='100px' src=http://www.zhaobiao.info/images/swordfish/sf_01.png /></div><div class='head des'>根据您设置的关键词 :<span class='keys'>%s</span>,剑鱼为您推送30天之内的信息。点击标题可查看详情信息</div><table cellpadding='0' cellspacing='0'>%s</table></div> </body>",
-	"mail_title": "您有新的%s信息-剑鱼招标订阅",
+	"mail_html": "<body><style> *,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;} </style><div id='all'><div class='head'><IMG width='100px' src=http://www.zhaobiao.info/images/swordfish/sf_01.png /></div><div class='head des'>根据您设置的关键词 :<span class='keys'>%s</span>,剑鱼标讯为您推送30天之内的信息。点击标题可查看详情信息</div><table cellpadding='0' cellspacing='0'>%s</table></div> </body>",
+	"mail_title": "您有新的%s信息-剑鱼标讯",
 	"mails": [{
 		"addr": "smtp.exmail.qq.com",
 		"port": 465,
@@ -66,9 +66,9 @@
 	"testids": ["15037870765"],
 	"weixinRpcServer": "127.0.0.1:8083",
 	"wxcolor": "#2cb7ca",
-	"wxcontent": "剑鱼推送",
+	"wxcontent": "剑鱼标讯推送",
 	"wxgroup": "招标信息",
-	"wxtitle": "根据你订阅的关键词“%s”,剑鱼为你推送以下信息。如果不想继续收到此类信息,可进入招标订阅的设置页面取消订阅。",
+	"wxtitle": "根据你订阅的关键词“%s”,剑鱼标讯为你推送以下信息。如果不想继续收到此类信息,可进入招标订阅的设置页面取消订阅。",
 	"wxdetailcolor":"#686868",
 	"appPushServiceRpc":"127.0.0.1:5566",
 	"pcPushHelper":"192.168.20.129:8082",

+ 1 - 1
src/jfw/modules/push/src/qfw/push/dopush/dopush.go

@@ -331,7 +331,7 @@ func SendFmail(email, subject, html string, dataexport int, fmdatas []map[string
 			rename = time.Now().Format("2006-01-02") + ".xlsx"
 		}
 	}
-	b := mail.GSendMail("剑鱼招标订阅", email, "", "", subject, html, fnamepath, rename, push.GmailMap)
+	b := mail.GSendMail("剑鱼标讯", email, "", "", subject, html, fnamepath, rename, push.GmailMap)
 	if !b {
 		log.Println(email, "邮件发送失败")
 	}

+ 1 - 1
src/jfw/modules/push/src/qfw/push/dopush/dopushes.go

@@ -671,7 +671,7 @@ func DoPush(a_p *Pjob, s_p *Pjob, MaxPushSize int, Now time.Time, isPushWxTpl bo
 	for _, v := range *allUsers {
 		select {
 		case <-time.After(time.Minute):
-			http.Get("http://123.56.236.148:19281/_send/_mail?program=testgo2&to=renzheng@topnet.net.cn,wangchuanjin@topnet.net.cn&title=push_剑鱼平台报警&body=" + url.QueryEscape(v.Id+",并发池PushPool一分钟写入超时,PushPoolLength"+fmt.Sprint(len(PushPool))))
+			http.Get("http://123.56.236.148:19281/_send/_mail?program=testgo2&to=renzheng@topnet.net.cn,wangchuanjin@topnet.net.cn&title=push_剑鱼标讯平台报警&body=" + url.QueryEscape(v.Id+",并发池PushPool一分钟写入超时,PushPoolLength"+fmt.Sprint(len(PushPool))))
 			PushPool <- true
 		case PushPool <- true:
 		}

+ 2 - 2
src/jfw/modules/push/src/qfw/push/dopush/excel.go

@@ -77,10 +77,10 @@ func GetBidInfoXlsx(data []map[string]interface{}) (fnamepath, rename string) {
 		cell = row.AddCell()
 		cell.SetValue(publishtime)
 	}
-	fx.AppendSheet(sheet, "剑鱼")
+	fx.AppendSheet(sheet, "剑鱼标讯")
 
 	t := time.Now()
-	rename = "剑鱼招标订阅_" + t.Format("2006-01-02") + "_推送信息表.xlsx"
+	rename = "剑鱼标讯_" + t.Format("2006-01-02") + "_推送信息表.xlsx"
 	fnamepath = "./xlsx/" + t.Format("20060102150405") + fmt.Sprint(rand.Intn(10000)) + ".xlsx"
 
 	err := fx.Save(fnamepath)

+ 4 - 4
src/jfw/modules/push_v1/src/config.json

@@ -11,8 +11,8 @@
 	"elasticPoolSize": 10,
 	"elasticSearch": "http://192.168.3.18:9800",
 	"mail_content": "<tr><td><num>%d</num></td><td><div class='tit'><a style='color: #000;text-decoration: none;' href='%s?mail' >%s</a></div></td><td style='float: right;' class='infos' ><span class='%s'>%s</span><span class='%s'>%s</span><span class='%s'>%s</span><span class='time'>%s</span></td></tr>",
-	"mail_html": "<body><style> *,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;} </style><div id='all'><div class='head'><IMG width='100px' src=http://www.zhaobiao.info/images/swordfish/sf_01.png /></div><div class='head des'>根据您设置的关键词 :<span class='keys'>%s</span>,剑鱼为您推送30天之内的信息。点击标题可查看详情信息</div><table cellpadding='0' cellspacing='0'>%s</table></div> </body>",
-	"mail_title": "您有新的%s信息-剑鱼招标订阅",
+	"mail_html": "<body><style> *,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;} </style><div id='all'><div class='head'><IMG width='100px' src=http://www.zhaobiao.info/images/swordfish/sf_01.png /></div><div class='head des'>根据您设置的关键词 :<span class='keys'>%s</span>,剑鱼标讯为您推送30天之内的信息。点击标题可查看详情信息</div><table cellpadding='0' cellspacing='0'>%s</table></div> </body>",
+	"mail_title": "您有新的%s信息-剑鱼标讯",
 	"mails": [{
 		"addr": "smtp.exmail.qq.com",
 		"port": 465,
@@ -27,9 +27,9 @@
 	"testids": ["5ba4aded25ef871eec5dedf4"],
 	"weixinRpcServer": "127.0.0.1:8083",
 	"wxColor": "#2cb7ca",
-	"wxContent": "剑鱼推送",
+	"wxContent": "剑鱼标讯推送",
 	"wxGroup": "招标信息",
-	"wxTitle": "根据你订阅的关键词“%s”,剑鱼为你推送以下信息。如果不想继续收到此类信息,可进入招标订阅的设置页面取消订阅。",
+	"wxTitle": "根据你订阅的关键词“%s”,剑鱼标讯为你推送以下信息。如果不想继续收到此类信息,可进入招标订阅的设置页面取消订阅。",
 	"wxDetailColor":"#686868",
 	"appPushServiceRpc":"127.0.0.1:5566",
 	"pcHelper":"192.168.20.129:8082",

+ 2 - 2
src/jfw/modules/push_v1/src/push/dopush/excel.go

@@ -77,10 +77,10 @@ func GetBidInfoXlsx(data []map[string]interface{}) (fnamepath, rename string) {
 		cell = row.AddCell()
 		cell.SetValue(publishtime)
 	}
-	fx.AppendSheet(sheet, "剑鱼")
+	fx.AppendSheet(sheet, "剑鱼标讯")
 
 	t := time.Now()
-	rename = "剑鱼招标订阅_" + t.Format("2006-01-02") + "_推送信息表.xlsx"
+	rename = "剑鱼标讯_" + t.Format("2006-01-02") + "_推送信息表.xlsx"
 	fnamepath = "./xlsx/" + t.Format("20060102150405") + fmt.Sprint(rand.Intn(10000)) + ".xlsx"
 
 	err := fx.Save(fnamepath)

+ 1 - 1
src/jfw/modules/push_v1/src/push/dopush/pushjob.go

@@ -705,7 +705,7 @@ func (p *PushJob) SendMail(email, subject, html string, fmdatas []map[string]int
 	//defer func() {
 	//Gmails <- gmail
 	//}()
-	status := mail.GSendMail("剑鱼招标订阅", email, "", "", subject, html, fnamepath, rename, Gmail)
+	status := mail.GSendMail("剑鱼标讯", email, "", "", subject, html, fnamepath, rename, Gmail)
 	if fnamepath != "" {
 		os.Remove(fnamepath)
 	}

BIN
src/jfw/modules/push_v1/src/src


Some files were not shown because too many files changed in this diff