Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

README.md

@@ -2,3 +2,8 @@
 微信和pc端功能
 weixin sdk https://github.com/wizjin/weixin
 web用xweb框架
+
+v2.8
+1.移动端数据导出
+2.微信、app搜索结果只显示500条
+3.剑鱼所有页面（pc、微信、app端）增加百度统计代码

src/config.json

@@ -1,318 +1,327 @@
 {
-	"mongodbServers": "192.168.3.11:27080",
-	"mongodbPoolSize": "25",
-	"mongodbName": "qfw",
-	"influxaddr": "http://192.168.3.11:8086",
-	"influxdb": "jy_logs",
-	"qrModelID": "2",
-	"numTimeNumber": 15,
-	"strTimeNumber": 30,
-	"elasticsearch": "http://192.168.3.11:9800",
-	"elasticPoolSize": 30,
-	"redisaddrs": "other=192.168.3.207:3379,push=192.168.3.207:3379,pushcache_1=192.168.3.207:3379,pushcache_2_a=192.168.3.207:3379,pushcache_2_b=192.168.3.207:3379,sso=192.168.3.207:3379,session=192.168.3.207:3379,recovery=192.168.3.207:3379",
-	"webport": "83",
-	"webrpcport": "8084",
-	"weixinrpc": "127.0.0.1:8083",
-	"cacheflag": false,
-	"cassandra": {
-		"log": {
-			"host": ["192.168.3.207"],
-			"size": 5,
-			"port": 9042
-		},
-		"push": {
-			"host": ["192.168.3.207"],
-			"size": 5
-		}
-	},
-	"agreement": "http",
-	"webdomain": "http://web-jydev-xzh.jianyu360.cn",
-	"redirect": {
-		"searchinfo": "/jylab/mainSearch",
-		"rssset": "/swordfish/historypush",
-		"viewdemo": "/front/viewdemo",
-		"wxpushlist": "/wxpush/bidinfo/%s",
-		"share": "/swordfish/guide/share",
-		"myfollow": "/follow/list",
-		"newInfoFollow": "/jylab/followent/newInfo/%s",
-		"entListFollow": "/jylab/followent/entList",
-		"pcmyfollow": "/follow/set/list/%s",
-		"feedback": "/swordfish/feedback",
-		"wxpushfollowlist": "/follow/notice/%s/%s",
-		"community": "http://www.myfans.cc/30a78e9b78",
-		"quickly": "http://mp.weixin.qq.com/s?__biz=MzIyNTM1NDUyNw==&mid=100000001&idx=1&sn=58e6008f0577d529a56c9ed78724decf&scene=0#wechat_redirect",
-		"useskill": "http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8#wechat_redirect",
-		"about": "/swordfish/about?flag=1",
-		"followset": "/follow/set/%s/%s",
-		"myfeedbacks": "/swordfish/myFeedbacks",
-		"zqluckdraw": "/active/zqLuckdraw",
-		"followent": "/jylab/followent/entList",
-		"labindex": "/jylab/index",
-		"qrToLab": "/jylab/qrToLab/%s",
-		"searchKeyword": "/jylab/searchKeyword/%s",
-		"sealRep": "/active/sealfriends/%s",
-		"sealIndex": "/active/seal/index",
-		"sealSend": "/active/seal/sealMsg",
-		"futureIndex": "/active/future/index",
-		"keysetIndex": "/wxkeyset/keyset/index?tiptext=%s",
-		"followEntDetail": "/jylab/followent/detail/%s",
-		"mymenu":"/front/wxMyOrder/myMenu"
-	},
-	"jy_activeset": {
-		"activitystartcode": "3201000000",
-		"activityendcode": "3201999999",
-		"code": "promation",
-		"jy_extend": {
-			"activitystartcode": "3202100000",
-			"activityendcode": "3202199999"
-		},
-		"jy_leaflets": {
-			"activitystartcode": "3202200000",
-			"activityendcode": "3202299999"
-		},
-		"jy_zqluckdraw": {
-			"activitystartcode": "3202300000",
-			"activityendcode": "3202399999"
-		}
-	},
-	"followProject": 10,
-	"pushRpc": "127.0.0.1:8766",
-	"followLimitDay": 30,
-	"followTipMsg": {
-		"title": "您关注的项目《%s》将于%s开标！",
-		"remark": "您收到这条信息是因为您之前设置了项目开标提醒，如果您不再需要此类提醒，可点击下方“详情”修改提醒设置。"
-	},
-	"followPushRpc": "127.0.0.1:8759",
-	"userPoolSize": 1000,
-	"recommendThreshold": 0.5,
-	"msg_server": "123.56.236.148:7070",
-	"rewardText": [
-		"憋说话！赏我！",
-		"“赏”就一个字 我只说一次",
-		"厉害了word鱼！",
-		"看官赏点银子偶会更卖力噢！",
-		"各位客官，快来赏点吧！",
-		"夸我还是含蓄点的好，赏一个吧~",
-		"爱，就供养；喜欢，就打赏！",
-		"请简单粗暴地爱我！",
-		"最喜欢你一言不合就打赏的样子了~~~么么！"
-	],
-	"advertText": [
-		"与其一个人孤单  不如一群人狂欢   赶快加入剑鱼标讯社区",
-		"加入剑鱼标讯社区  和投标大神做朋友",
-		"来剑鱼标讯社区  找最合拍的伙伴",
-		"剑鱼标讯社区，让沟通连接你我。",
-		"剑鱼标讯社区，分享你的知识、解决问题、行业资源交换",
-		"勇敢发声，和老司机一起畅聊招投标。",
-		"春风十里，不如来剑鱼标讯社区！",
-		"只要心相通，相隔千里也能畅快交流。",
-		"弹指一挥间，剑鱼标讯因你而不同！",
-		"携手同行，认真对待每一次招投标"
-	],
-	"recoveryText": [
-		"火眼金睛的你，已超越99%的同行！",
-		"感谢你及时纠正了我的胡说八道！",
-		"剑鱼标讯已收到指示，并给你手动点赞。",
-		"感谢纠错，剑鱼标讯正在火速补救。",
-		"听说帮剑鱼标讯纠错的人最后都中了标！",
-		"你帮助了众多投标人，很棒棒哟！",
-		"不嫌千辛万苦来纠错，剑鱼标讯给你小心心！",
-		"感谢你的火眼金睛，剑鱼标讯光速更新中...",
-		"老铁，我已收到，欢迎将纠错进行到底。"
-	],
-	"recoveryRight": [
-		"火眼金睛的你，已超越99%的同行！",
-		"剑鱼标讯已收到指示，并给你手动点赞。",
-		"你帮助了众多投标人，很棒棒哟！"
-	],
-	"recoveryField": {
-		"招标": [{
-				"proportion": 15,
-				"field": "projectname"
-			},
-			{
-				"proportion": 5,
-				"field": "budget"
-			},
-			{
-				"proportion": 15,
-				"field": "buyer"
-			},
-			{
-				"proportion": 5,
-				"field": "agency"
-			},
-			{
-				"proportion": 15,
-				"field": "winner"
-			},
-			{
-				"proportion": 15,
-				"field": "bidopentime"
-			},
-			{
-				"proportion": 15,
-				"field": "buyerperson"
-			},
-			{
-				"proportion": 15,
-				"field": "buyertel"
-			}
-		],
-		"其他": [{
-				"proportion": 8,
-				"field": "projectname"
-			},
-			{
-				"proportion": 12,
-				"field": "budget"
-			},
-			{
-				"proportion": 8,
-				"field": "buyer"
-			},
-			{
-				"proportion": 12,
-				"field": "agency"
-			},
-			{
-				"proportion": 12,
-				"field": "winner"
-			},
-			{
-				"proportion": 12,
-				"field": "bidamount"
-			},
-			{
-				"proportion": 12,
-				"field": "bidopentime"
-			},
-			{
-				"proportion": 12,
-				"field": "buyerperson"
-			},
-			{
-				"proportion": 12,
-				"field": "buyertel"
-			}
-		]
-	},
-	"advertImg": "/images/advert.png",
-	"advertName": "广告",
-	"advertUrl": "/swordfish/about",
-	"wxJianyu": {
-		"appid": "wx0e6a5b18f4cfd10d",
-		"appsecret": "bf12200554cb6edeb2be69d49dc11a3e",
-		"pay":{
-			"mchid": "1418321102",
-			"key": "topnet2016topnet2016topnet2016ab",
-			"attachmsg": "剑鱼标讯打赏",
-			"bodymsg": "剑鱼标讯-招标信息打赏",
-			"detailmsg": "招标推送信息[%s] 打赏%s元钱",
-			"sjdc_attachmsg": "剑鱼标讯-历史数据",
-			"sjdc_bodymsg": "剑鱼标讯-历史数据",
-			"sjdc_detailmsg": "剑鱼标讯-历史数据"
-		}
-	},
-	"aliPay": {
-		"appid": "2016092900620854",
-		"reqUrl": "https://openapi.alipaydev.com/gateway.do",
-		"Subject": "剑鱼数据导出",
-		"privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAtO7CU4hpdcMmV43MEA8bqQJYYx+f6yvYkP0nFc/oCvU24bU6zAdK/H2H56quEwD8Dh5YtVTfUCcKqpcG9HXY11TXWKCEUQiK1tkb0o7oSSURwk6h1DdDbg8m1+H8s+k+mvMvcqVCYKYi03PIPQyJCuHmzx/vcaALXRr2HOrEFaFFA8WYST1rywiKeyrC9PCNX1aJjGADhCs3cGrdZEJc4k+2tIHTYJccx+mJ96QiEkzFhJTqEmSFPcNqNUX9uCPgeVhfHW2pRNyffvrhoEyeSr1QoOpaYyn0I5JD2axnypBFCbk6P69LY3eGNKtOe81lp9hiZbMYpXPqb6KwPXTVQQIDAQABAoIBAEbJQm276MaR2uZWK4f84S12JW5iaQZw2QGgiTIXbQkcdqRHawF3uPafhhQ0ynXU5MgBR2NqGRQasimbfLUXhgZ4wueBpUKuvOLhfekaz/YN8qy6ZsXH+TGN6/x6BYu9rSiiC+YmkZmOZgGkQqrfxJ3lU4+lRuCFZOzAJ5mYn652CHRJXy6eDgZfyFLP2ol4/ioJEhwnGFXV345DlsVgmXTEe+IfjTyuvzxBtjod4lfu3dj/f2PhPrcgvN0ZQf1ldZbS+6FkMWInMOQt/WsJ/ANfiKgQ4sPzlxIhmVjrvDlnYTc1lbFekyInzZumV0pDyId+1Y6LAjxJTAhnjFAlBSECgYEAwsQdxOiZNLtxZ8J8JCQHKERYIo7euArW0iAurF+3Q9VNeGj0voFrmfHPju5OF5BHtuc7D3lkwZG4Ac+pyQtxF5dsEMl4vBoNc6onRQFsSDVEEIpl7OBghGlg1as23tvPSMh7DKnILM9OzVfFQ9WLvwHJwLRGsM7LOtmNovq4UFsCgYEA7dE/9Avr5YtCUjij8Y2zkAxN6qb8+ggqFoPiCr91JNGaKNKV9D2K7D3Zk49TXFJm7SX2zgYFuqR2Pa9vAWh9jtmwsc8L0qpIym4J1MM5ud/Xiu9c8O/prQOr7JlICNdk8WfqGbUC83BYfWa5SDonlXFYi6x3LlXdZnvEfZF645MCgYAC2ZnR6tFrGx8StJ7abIiKR02+27ZYnRf9pSjprtDgtjtW+royG3S2oPo3jjcoUx0piQKtPEqEJpy5sg86+ObjwHx9VmVk40C1I5VFhjrOZ7EiSNQq/jGLXntjRQkdg7vpxb0/NzDNrw7pJFKnpnVQCzenkTvDlJMWvl47N04BJwKBgHnpVtuIcPlPFkSH/KMLfQ1PAXJVAEI8hTbdjLbtxuOE/34F1hFKqzjHzA2034roQxM27vpWZAF15Zdho4oZQqREPCwqc2kfGgmLt0Z2fdUnRptWcVKh6ixjQXMccKz3niuSlZNwE38wDGzciAbaqQgW/sk7NC1wnvq2X9fvCAw5AoGANG2usqWYF4x+LvbhcdrKpJsjtvkLa2u9g2/wNXdoj+tBrv310O22/YM5LOcq9MrKPlx1S1C1KLoQO9TWFZiYuQ9C/sk7/ZTNmKQxCxVV0FVPaBYp+meD6sjgoRVJvaqY0UxnJwlHWMrusPTFua7Mtogqx9cvzlQolWh5VX7N1DM=\n-----END RSA PRIVATE KEY-----",
-		"callbackPublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkZY9RWrX1cZi/AWuBn7u6bjoT2RMBaq4Gdc87CgrIZm89wa28mYzbnuOrzxGtEMP82lU/KoVAbzY46j7s+bR0qUyUwQyFDFHYzDNSjhngeokzcZ+8rU6a8IOyXOHU0V2BLuvzKb44P4ctzZpmgtDZfxMbAt0ULumz9ma3elYa3pEYgQCoWm5i9eiN8DwhY2uBKZ94vW8+c2iCSwoNntZt6S608TYNOICl7nNWIR+zu3f3HnEE+7mQR37XC1aJWmtH5hKrHF8W5PVzEGhOWETcEdpUmaLhXOfN9nCBKNgFbYUmH+r6s93kfdHAqm6MEuFE6m42nmk6lqoDhEeHKteQIDAQAB"
-	},
-	"industry": "分类综合测试",
-	"recommendEntLimit": "50",
-	"jyapp": {
-		"domain": "http://web-jydev-wky.jianyu360.cn",
-		"apkurl": "/jyapp/res/%s/jianyu360.apk",
-		"appstoreurl": "https://itunes.apple.com/cn/app/id1354897149",
-		"channelDir": {
-			"s001": "baiduSem",
-			"s003": "shenmaSem",
-			"huawei": "huawei",
-			"xiaomi": "xiaomi",
-			"yingyongbao": "yingyongbao",
-			"douyin": "douyin",
-			"wx01": "jywx",
-			"topnet": "topnet",
-			"duanxin": "duanxin",
-			"default": "topnet"
-		}
-	},
-	"limitSearchText": {
-		"flag": false,
-		"count": 3,
-		"timeout": 60,
-		"totalPage": 10,
-		"userIds": [
-			"o8-2pwHj1s_tv3nnRxrH9cD2ngkk",
-			"oHwE_wEzNi8ASXJ7YEVvZ73YfwHw",
-			"oHwE_wO-IK3t2Emq95K9hxuWTuC4",
-			"oHwE_wGFScDzGRPAWNaT0ZE9vDn8",
-			"oHwE_wDlNyATr6Qb0iXynZf1EeEE"
-		],
-		"msg": "f 开关状态：%s //-2 从配置文件重置，-1 关闭，1 打开<br><br>c 并发数：%d //-2 不限制并发数，-1 无条件直接限制，>0 限制并发数<br><br>t 个人查询限制时间：%ds //-1 不限制<br><br>p 限制页数：%d"
-	},
-	"share": {
-		"forceShareEnabled": false,
-		"onlineDate": "2018-08-20 00:00:00",
-		"regDaysForNewUser": 5,
-		"shareIntervalDays": 7,
-		"startHour": 8,
-		"endHour": 17,
-		"shareTimesUpperLimitR": 4000,
-		"shareTimesUpperLimitIrr": 1000
-	},
-	"cookiedomain": "web-jydev-wky.jianyu360.cn",
-	"pcHelper": {
-		"subscribeTokenTimeout": 15,
-		"version": "V2.5.1"
-	},
-	"mysql": {
-		"dbName": "jianyu",
-		"address": "192.168.3.11:3366",
-		"userName": "root",
-		"passWord": "Topnet123"
-	},
-	"mail": [{
-		"addr": "smtp.exmail.qq.com",
-		"port": 465,
-		"pwd": "ue9Rg9Sf4CVtdm5a",
-		"user": "public03@topnet.net.cn"
-	}, {
-		"addr": "smtp.exmail.qq.com",
-		"port": 465,
-		"pwd": "ue9Rg9Sf4CVtdm5a",
-		"user": "public03@topnet.net.cn"
-	}],
-	"sealAmount": {
-		"销冠王": "30000",
-		"全才": "30000",
-		"社交红人": "30000",
-		"灵魂人物": "30000",
-		"有态度": "20000",
-		"钢铁意志": "20000",
-		"机敏过人": "20000",
-		"行动派": "20000",
-		"细节控": "20000",
-		"神队友": "20000",
-		"业务666": "20000",
-		"靠谱": "20000",
-		"情商贼高": "10000",
-		"嘴皮子溜": "10000",
-		"脑洞倍儿大": "10000",
-		"靠实力说话": "10000"
-	},
-	"makepicurl": "http://39.105.183.186:11120",
-	"intranetip": {
-		"jy": "http://webxzh.qmx.top"
-	},
-	"getpicurl": "https://res.jianyu360.com/",
-	"sealSendTime": 14400,
-	"appPushServiceRpc": "127.0.0.1:5566",
-	"pushTimeout": 300,
-	"ninePushTimeout": 172800,
-	"openPlatformUrl": "https://open-jytest.jianyu360.cn/",
-	"sessionEnctryFlushCorn": "0 0/10 * * * ?"
+    "mongodbServers": "192.168.3.11:27080",
+    "mongodbPoolSize": "25",
+    "mongodbName": "qfw",
+    "influxaddr": "http://192.168.3.11:8086",
+    "influxdb": "jy_logs",
+    "qrModelID": "2",
+    "numTimeNumber": 15,
+    "strTimeNumber": 30,
+    "elasticsearch": "http://192.168.3.11:9800",
+    "elasticPoolSize": 30,
+    "redisaddrs": "other=192.168.3.128:1712,push=192.168.3.128:1712,pushcache_1=192.168.3.128:1712,pushcache_2_a=192.168.3.128:1712,pushcache_2_b=192.168.3.128:1712,sso=192.168.3.128:1712,session=192.168.3.128:1712,recovery=192.168.3.128:1712",
+    "webport": "83",
+    "webrpcport": "8084",
+    "weixinrpc": "127.0.0.1:8083",
+    "cacheflag": false,
+    "cassandra": {
+        "log": {
+            "host": [
+                "192.168.3.207"
+            ],
+            "size": 5,
+            "port": 9042
+        },
+        "push": {
+            "host": [
+                "192.168.3.207"
+            ],
+            "size": 5
+        }
+    },
+    "agreement": "http",
+    "webdomain": "http://web-jydev-ws.jianyu360.cn",
+    "redirect": {
+        "searchinfo": "/jylab/mainSearch",
+        "rssset": "/swordfish/historypush",
+        "viewdemo": "/front/viewdemo",
+        "wxpushlist": "/wxpush/bidinfo/%s",
+        "share": "/swordfish/guide/share",
+        "myfollow": "/follow/list",
+        "newInfoFollow": "/jylab/followent/newInfo/%s",
+        "entListFollow": "/jylab/followent/entList",
+        "pcmyfollow": "/follow/set/list/%s",
+        "feedback": "/swordfish/feedback",
+        "wxpushfollowlist": "/follow/notice/%s/%s",
+        "community": "http://www.myfans.cc/30a78e9b78",
+        "quickly": "http://mp.weixin.qq.com/s?__biz=MzIyNTM1NDUyNw==&mid=100000001&idx=1&sn=58e6008f0577d529a56c9ed78724decf&scene=0#wechat_redirect",
+        "useskill": "http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8#wechat_redirect",
+        "about": "/swordfish/about?flag=1",
+        "followset": "/follow/set/%s/%s",
+        "myfeedbacks": "/swordfish/myFeedbacks",
+        "zqluckdraw": "/active/zqLuckdraw",
+        "followent": "/jylab/followent/entList",
+        "labindex": "/jylab/index",
+        "qrToLab": "/jylab/qrToLab/%s",
+        "searchKeyword": "/jylab/searchKeyword/%s",
+        "sealRep": "/active/sealfriends/%s",
+        "sealIndex": "/active/seal/index",
+        "sealSend": "/active/seal/sealMsg",
+        "futureIndex": "/active/future/index",
+        "keysetIndex": "/wxkeyset/keyset/index?tiptext=%s",
+        "followEntDetail": "/jylab/followent/detail/%s",
+        "mymenu": "/front/wxMyOrder/myMenu"
+    },
+    "jy_activeset": {
+        "activitystartcode": "3201000000",
+        "activityendcode": "3201999999",
+        "code": "promation",
+        "jy_extend": {
+            "activitystartcode": "3202100000",
+            "activityendcode": "3202199999"
+        },
+        "jy_leaflets": {
+            "activitystartcode": "3202200000",
+            "activityendcode": "3202299999"
+        },
+        "jy_zqluckdraw": {
+            "activitystartcode": "3202300000",
+            "activityendcode": "3202399999"
+        }
+    },
+    "followProject": 10,
+    "pushRpc": "127.0.0.1:8766",
+    "followLimitDay": 30,
+    "followTipMsg": {
+        "title": "您关注的项目《%s》将于%s开标！",
+        "remark": "您收到这条信息是因为您之前设置了项目开标提醒，如果您不再需要此类提醒，可点击下方“详情”修改提醒设置。"
+    },
+    "followPushRpc": "127.0.0.1:8759",
+    "userPoolSize": 1000,
+    "recommendThreshold": 0.5,
+    "msg_server": "123.56.236.148:7070",
+    "rewardText": [
+        "憋说话！赏我！",
+        "“赏”就一个字 我只说一次",
+        "厉害了word鱼！",
+        "看官赏点银子偶会更卖力噢！",
+        "各位客官，快来赏点吧！",
+        "夸我还是含蓄点的好，赏一个吧~",
+        "爱，就供养；喜欢，就打赏！",
+        "请简单粗暴地爱我！",
+        "最喜欢你一言不合就打赏的样子了~~~么么！"
+    ],
+    "advertText": [
+        "与其一个人孤单  不如一群人狂欢   赶快加入剑鱼标讯社区",
+        "加入剑鱼标讯社区  和投标大神做朋友",
+        "来剑鱼标讯社区  找最合拍的伙伴",
+        "剑鱼标讯社区，让沟通连接你我。",
+        "剑鱼标讯社区，分享你的知识、解决问题、行业资源交换",
+        "勇敢发声，和老司机一起畅聊招投标。",
+        "春风十里，不如来剑鱼标讯社区！",
+        "只要心相通，相隔千里也能畅快交流。",
+        "弹指一挥间，剑鱼标讯因你而不同！",
+        "携手同行，认真对待每一次招投标"
+    ],
+    "recoveryText": [
+        "火眼金睛的你，已超越99%的同行！",
+        "感谢你及时纠正了我的胡说八道！",
+        "剑鱼标讯已收到指示，并给你手动点赞。",
+        "感谢纠错，剑鱼标讯正在火速补救。",
+        "听说帮剑鱼标讯纠错的人最后都中了标！",
+        "你帮助了众多投标人，很棒棒哟！",
+        "不嫌千辛万苦来纠错，剑鱼标讯给你小心心！",
+        "感谢你的火眼金睛，剑鱼标讯光速更新中...",
+        "老铁，我已收到，欢迎将纠错进行到底。"
+    ],
+    "recoveryRight": [
+        "火眼金睛的你，已超越99%的同行！",
+        "剑鱼标讯已收到指示，并给你手动点赞。",
+        "你帮助了众多投标人，很棒棒哟！"
+    ],
+    "recoveryField": {
+        "招标": [
+            {
+                "proportion": 15,
+                "field": "projectname"
+            },
+            {
+                "proportion": 5,
+                "field": "budget"
+            },
+            {
+                "proportion": 15,
+                "field": "buyer"
+            },
+            {
+                "proportion": 5,
+                "field": "agency"
+            },
+            {
+                "proportion": 15,
+                "field": "winner"
+            },
+            {
+                "proportion": 15,
+                "field": "bidopentime"
+            },
+            {
+                "proportion": 15,
+                "field": "buyerperson"
+            },
+            {
+                "proportion": 15,
+                "field": "buyertel"
+            }
+        ],
+        "其他": [
+            {
+                "proportion": 8,
+                "field": "projectname"
+            },
+            {
+                "proportion": 12,
+                "field": "budget"
+            },
+            {
+                "proportion": 8,
+                "field": "buyer"
+            },
+            {
+                "proportion": 12,
+                "field": "agency"
+            },
+            {
+                "proportion": 12,
+                "field": "winner"
+            },
+            {
+                "proportion": 12,
+                "field": "bidamount"
+            },
+            {
+                "proportion": 12,
+                "field": "bidopentime"
+            },
+            {
+                "proportion": 12,
+                "field": "buyerperson"
+            },
+            {
+                "proportion": 12,
+                "field": "buyertel"
+            }
+        ]
+    },
+    "advertImg": "/images/advert.png",
+    "advertName": "广告",
+    "advertUrl": "/swordfish/about",
+    "wxJianyu": {
+        "appid": "wxd66e9589c9fecff6",
+        "appsecret": "4d9d4b9ddab59e65fcb7bed125fbd342",
+        "pay": {
+            "mchid": "1418321102",
+            "key": "topnet2016topnet2016topnet2016ab",
+            "attachmsg": "剑鱼标讯打赏",
+            "bodymsg": "剑鱼标讯-招标信息打赏",
+            "detailmsg": "招标推送信息[%s] 打赏%s元钱",
+            "sjdc_attachmsg": "剑鱼标讯-历史数据",
+            "sjdc_bodymsg": "剑鱼标讯-历史数据",
+            "sjdc_detailmsg": "剑鱼标讯-历史数据"
+        }
+    },
+    "aliPay": {
+        "appid": "2016092900620854",
+        "reqUrl": "https://openapi.alipaydev.com/gateway.do",
+        "Subject": "剑鱼数据导出",
+        "privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAtO7CU4hpdcMmV43MEA8bqQJYYx+f6yvYkP0nFc/oCvU24bU6zAdK/H2H56quEwD8Dh5YtVTfUCcKqpcG9HXY11TXWKCEUQiK1tkb0o7oSSURwk6h1DdDbg8m1+H8s+k+mvMvcqVCYKYi03PIPQyJCuHmzx/vcaALXRr2HOrEFaFFA8WYST1rywiKeyrC9PCNX1aJjGADhCs3cGrdZEJc4k+2tIHTYJccx+mJ96QiEkzFhJTqEmSFPcNqNUX9uCPgeVhfHW2pRNyffvrhoEyeSr1QoOpaYyn0I5JD2axnypBFCbk6P69LY3eGNKtOe81lp9hiZbMYpXPqb6KwPXTVQQIDAQABAoIBAEbJQm276MaR2uZWK4f84S12JW5iaQZw2QGgiTIXbQkcdqRHawF3uPafhhQ0ynXU5MgBR2NqGRQasimbfLUXhgZ4wueBpUKuvOLhfekaz/YN8qy6ZsXH+TGN6/x6BYu9rSiiC+YmkZmOZgGkQqrfxJ3lU4+lRuCFZOzAJ5mYn652CHRJXy6eDgZfyFLP2ol4/ioJEhwnGFXV345DlsVgmXTEe+IfjTyuvzxBtjod4lfu3dj/f2PhPrcgvN0ZQf1ldZbS+6FkMWInMOQt/WsJ/ANfiKgQ4sPzlxIhmVjrvDlnYTc1lbFekyInzZumV0pDyId+1Y6LAjxJTAhnjFAlBSECgYEAwsQdxOiZNLtxZ8J8JCQHKERYIo7euArW0iAurF+3Q9VNeGj0voFrmfHPju5OF5BHtuc7D3lkwZG4Ac+pyQtxF5dsEMl4vBoNc6onRQFsSDVEEIpl7OBghGlg1as23tvPSMh7DKnILM9OzVfFQ9WLvwHJwLRGsM7LOtmNovq4UFsCgYEA7dE/9Avr5YtCUjij8Y2zkAxN6qb8+ggqFoPiCr91JNGaKNKV9D2K7D3Zk49TXFJm7SX2zgYFuqR2Pa9vAWh9jtmwsc8L0qpIym4J1MM5ud/Xiu9c8O/prQOr7JlICNdk8WfqGbUC83BYfWa5SDonlXFYi6x3LlXdZnvEfZF645MCgYAC2ZnR6tFrGx8StJ7abIiKR02+27ZYnRf9pSjprtDgtjtW+royG3S2oPo3jjcoUx0piQKtPEqEJpy5sg86+ObjwHx9VmVk40C1I5VFhjrOZ7EiSNQq/jGLXntjRQkdg7vpxb0/NzDNrw7pJFKnpnVQCzenkTvDlJMWvl47N04BJwKBgHnpVtuIcPlPFkSH/KMLfQ1PAXJVAEI8hTbdjLbtxuOE/34F1hFKqzjHzA2034roQxM27vpWZAF15Zdho4oZQqREPCwqc2kfGgmLt0Z2fdUnRptWcVKh6ixjQXMccKz3niuSlZNwE38wDGzciAbaqQgW/sk7NC1wnvq2X9fvCAw5AoGANG2usqWYF4x+LvbhcdrKpJsjtvkLa2u9g2/wNXdoj+tBrv310O22/YM5LOcq9MrKPlx1S1C1KLoQO9TWFZiYuQ9C/sk7/ZTNmKQxCxVV0FVPaBYp+meD6sjgoRVJvaqY0UxnJwlHWMrusPTFua7Mtogqx9cvzlQolWh5VX7N1DM=\n-----END RSA PRIVATE KEY-----",
+        "callbackPublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkZY9RWrX1cZi/AWuBn7u6bjoT2RMBaq4Gdc87CgrIZm89wa28mYzbnuOrzxGtEMP82lU/KoVAbzY46j7s+bR0qUyUwQyFDFHYzDNSjhngeokzcZ+8rU6a8IOyXOHU0V2BLuvzKb44P4ctzZpmgtDZfxMbAt0ULumz9ma3elYa3pEYgQCoWm5i9eiN8DwhY2uBKZ94vW8+c2iCSwoNntZt6S608TYNOICl7nNWIR+zu3f3HnEE+7mQR37XC1aJWmtH5hKrHF8W5PVzEGhOWETcEdpUmaLhXOfN9nCBKNgFbYUmH+r6s93kfdHAqm6MEuFE6m42nmk6lqoDhEeHKteQIDAQAB"
+    },
+    "industry": "分类综合测试",
+    "recommendEntLimit": "50",
+    "jyapp": {
+        "domain": "http://web-jydev-wky.jianyu360.cn",
+        "apkurl": "/jyapp/res/%s/jianyu360.apk",
+        "appstoreurl": "https://itunes.apple.com/cn/app/id1354897149",
+        "channelDir": {
+            "s001": "baiduSem",
+            "s003": "shenmaSem",
+            "huawei": "huawei",
+            "xiaomi": "xiaomi",
+            "yingyongbao": "yingyongbao",
+            "douyin": "douyin",
+            "wx01": "jywx",
+            "topnet": "topnet",
+            "duanxin": "duanxin",
+            "default": "topnet"
+        }
+    },
+    "limitSearchText": {
+        "flag": false,
+        "count": 3,
+        "timeout": 60,
+        "totalPage": 10,
+        "userIds": [
+            "o8-2pwHj1s_tv3nnRxrH9cD2ngkk",
+            "oHwE_wEzNi8ASXJ7YEVvZ73YfwHw",
+            "oHwE_wO-IK3t2Emq95K9hxuWTuC4",
+            "oHwE_wGFScDzGRPAWNaT0ZE9vDn8",
+            "oHwE_wDlNyATr6Qb0iXynZf1EeEE"
+        ],
+        "msg": "f 开关状态：%s //-2 从配置文件重置，-1 关闭，1 打开<br><br>c 并发数：%d //-2 不限制并发数，-1 无条件直接限制，>0 限制并发数<br><br>t 个人查询限制时间：%ds //-1 不限制<br><br>p 限制页数：%d"
+    },
+    "share": {
+        "forceShareEnabled": false,
+        "onlineDate": "2018-08-20 00:00:00",
+        "regDaysForNewUser": 5,
+        "shareIntervalDays": 7,
+        "startHour": 8,
+        "endHour": 17,
+        "shareTimesUpperLimitR": 4000,
+        "shareTimesUpperLimitIrr": 1000
+    },
+    "cookiedomain": "web-jydev-wky.jianyu360.cn",
+    "pcHelper": {
+        "subscribeTokenTimeout": 15,
+        "version": "V2.5.1"
+    },
+    "mysql": {
+        "dbName": "jianyu",
+        "address": "192.168.3.11:3366",
+        "userName": "root",
+        "passWord": "Topnet123"
+    },
+    "mail": [
+        {
+            "addr": "smtp.exmail.qq.com",
+            "port": 465,
+            "pwd": "ue9Rg9Sf4CVtdm5a",
+            "user": "public03@topnet.net.cn"
+        },
+        {
+            "addr": "smtp.exmail.qq.com",
+            "port": 465,
+            "pwd": "ue9Rg9Sf4CVtdm5a",
+            "user": "public03@topnet.net.cn"
+        }
+    ],
+    "sealAmount": {
+        "销冠王": "30000",
+        "全才": "30000",
+        "社交红人": "30000",
+        "灵魂人物": "30000",
+        "有态度": "20000",
+        "钢铁意志": "20000",
+        "机敏过人": "20000",
+        "行动派": "20000",
+        "细节控": "20000",
+        "神队友": "20000",
+        "业务666": "20000",
+        "靠谱": "20000",
+        "情商贼高": "10000",
+        "嘴皮子溜": "10000",
+        "脑洞倍儿大": "10000",
+        "靠实力说话": "10000"
+    },
+    "makepicurl": "http://39.105.183.186:11120",
+    "intranetip": {
+        "jy": "http://webxzh.qmx.top"
+    },
+    "getpicurl": "https://res.jianyu360.com/",
+    "sealSendTime": 14400,
+    "appPushServiceRpc": "127.0.0.1:5566",
+    "pushTimeout": 300,
+    "ninePushTimeout": 172800,
+    "openPlatformUrl": "https://open-jytest.jianyu360.cn/",
+    "sessionEnctryFlushCorn": "0 0/10 * * * ?"
 }

src/jfw/front/wxMyOrder.go

@@ -3,10 +3,13 @@ package front
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"jfw/config"
+	"jfw/jyutil"
 	"jfw/public"
 	"jfw/wx"
 	"log"
+	"net/url"
 	"qfw/util"
 	"strconv"
 	"strings"
@@ -133,7 +136,33 @@ func (w *WxMyOrder) GetOneMore() error {
 //
 func (w *WxMyOrder) MyMenu() error {
 	if w.Session().Get("userId") == nil {
-		return errors.New("未登录")
+		checkIsSubscribeFlag := true
+		if w.GetString("state") == "wx" {
+			//微信跳回来的
+			code := w.GetString("code")
+			if code != "" {
+				openid := jyutil.Getopenid(code)
+				if openid != "" {
+					isSubscribe := true
+					if !checkIsSubscribeFlag {
+						checkIsSubscribeFlag = true
+						isSubscribe = CheckUserIsSubscribe(openid)
+					}
+					if isSubscribe {
+						FindUserAndCreateSess(openid, w.Session())
+					}
+				}
+			}
+		} else {
+			if public.CheckWxBrowser(w.Request) {
+				//所有参数都不再使用,跳到微信验证用户
+				return w.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(w.Site()+w.Url()), "wx"), 302)
+			}
+		}
+		userid := util.ObjToString(w.GetSession("userId"))
+		if userid == "" {
+			return errors.New("未登录")
+		}
 	}
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -149,7 +178,33 @@ func (w *WxMyOrder) MyMenu() error {
 func (w *WxMyOrder) ToMyWxOrder() error {
 	defer util.Catch()
 	if w.Session().Get("userId") == nil {
-		return errors.New("未登录")
+		checkIsSubscribeFlag := true
+		if w.GetString("state") == "wx" {
+			//微信跳回来的
+			code := w.GetString("code")
+			if code != "" {
+				openid := jyutil.Getopenid(code)
+				if openid != "" {
+					isSubscribe := true
+					if !checkIsSubscribeFlag {
+						checkIsSubscribeFlag = true
+						isSubscribe = CheckUserIsSubscribe(openid)
+					}
+					if isSubscribe {
+						FindUserAndCreateSess(openid, w.Session())
+					}
+				}
+			}
+		} else {
+			if public.CheckWxBrowser(w.Request) {
+				//所有参数都不再使用,跳到微信验证用户
+				return w.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(w.Site()+w.Url()), "wx"), 302)
+			}
+		}
+		userid := util.ObjToString(w.GetSession("userId"))
+		if userid == "" {
+			return errors.New("未登录")
+		}
 	}
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
 	myopenid, _ := w.Session().Get("s_m_openid").(string)
@@ -278,7 +333,33 @@ func (w *WxMyOrder) WxToOrderDetail() error {
 	if openid := w.GetSession("s_m_openid"); openid != nil {
 		myOpenid = openid.(string)
 	} else {
-		return errors.New("未登录")
+		checkIsSubscribeFlag := true
+		if w.GetString("state") == "wx" {
+			//微信跳回来的
+			code := w.GetString("code")
+			if code != "" {
+				openid := jyutil.Getopenid(code)
+				if openid != "" {
+					isSubscribe := true
+					if !checkIsSubscribeFlag {
+						checkIsSubscribeFlag = true
+						isSubscribe = CheckUserIsSubscribe(openid)
+					}
+					if isSubscribe {
+						FindUserAndCreateSess(openid, w.Session())
+					}
+				}
+			}
+		} else {
+			if public.CheckWxBrowser(w.Request) {
+				//所有参数都不再使用,跳到微信验证用户
+				return w.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(w.Site()+w.Url()), "wx"), 302)
+			}
+		}
+		userid := util.ObjToString(w.GetSession("userId"))
+		if userid == "" {
+			return errors.New("未登录")
+		}
 	}
 	userid, _ := w.Session().Get("userId").(string)
 	orderCode := w.GetString("orderCode")

src/jfw/modules/app/src/web/templates/app/update.html

@@ -96,5 +96,7 @@
 			}
 			new FastClick(document.body);
 		</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/jfw/modules/app/src/web/templates/common/baiducc.html

@@ -6,4 +6,13 @@ var _hmt = _hmt || [];
 	var s = document.getElementsByTagName("script")[0]; 
 	s.parentNode.insertBefore(hm, s);
 })();
+</script>
+<script>
+var _hmt = _hmt || [];
+(function() {
+  var hm = document.createElement("script");
+  hm.src = "https://hm.baidu.com/hm.js?72331746d85dcac3dac65202d103e5d9";
+  var s = document.getElementsByTagName("script")[0]; 
+  s.parentNode.insertBefore(hm, s);
+})();
 </script>

src/jfw/modules/app/src/web/templates/dataExport/404.html

@@ -16,5 +16,7 @@
 				<a href="javascript:history.go(-1)">返回筛选</a>
 			</main>
 		</div>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExPort.html

@@ -656,6 +656,8 @@
     })
 </script>
     
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html

@@ -221,6 +221,8 @@
         })
 
     </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_applyInvoice.html

@@ -292,5 +292,7 @@
 			}
             
         </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
     </body>
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_area.html

@@ -592,5 +592,7 @@
 
 			})
 		</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html

@@ -119,6 +119,8 @@
 
 </script>
 
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerInput.html

@@ -160,6 +160,8 @@
 
     </script>
 
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html

@@ -412,6 +412,8 @@
         })
 
     </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html

@@ -233,6 +233,8 @@
         })
 
     </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_industry.html

@@ -343,5 +343,7 @@
 
 
     </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_invoiceSuccess.html

@@ -75,5 +75,7 @@
 			 },1000);
 			}
         </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
     </body>
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html

@@ -304,6 +304,8 @@
         });
 
     </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html

@@ -213,6 +213,8 @@
     });
 
 </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -624,5 +624,7 @@
 				}
 			}
 		</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_paySuccess.html

@@ -91,5 +91,7 @@
 			</main>
 			<a class="go_detail">查看订单</a>
 		</div>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html

@@ -59,5 +59,7 @@
 				})
 			})
 		</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_price.html

@@ -161,5 +161,7 @@
         });
     })
 </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_subType.html

@@ -337,5 +337,7 @@
                 $("#nijianTip").hide();
             });
     </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -1122,5 +1122,7 @@
 			}
 		
 		</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html

@@ -622,5 +622,7 @@
 		        </div>
 			</main>
 		</div>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html

@@ -271,6 +271,8 @@
 		})
 
 	</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 
 </html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html

@@ -162,6 +162,8 @@
     })
 
     </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/jfw/modules/app/src/web/templates/me/download.html

@@ -124,4 +124,6 @@
 			}
 		}
 	</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </html>

src/jfw/modules/app/src/web/templates/me/forgetPwd.html

@@ -162,6 +162,8 @@
 			}
 		</script>
 
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 
 </html>

src/jfw/modules/app/src/web/templates/me/forgetPwdTwo.html

@@ -129,5 +129,7 @@
 				}
 			}
 		</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/jfw/modules/app/src/web/templates/me/iframe.html

@@ -29,4 +29,6 @@
 		}
 		$("iframe").attr("src",url);
 	</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </html>

src/jfw/modules/app/src/web/templates/me/index.html

@@ -361,5 +361,7 @@
 			}
 		}
 	</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/jfw/modules/app/src/web/templates/me/login.html

@@ -379,5 +379,7 @@
 			}
 		}
 	</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/jfw/modules/app/src/web/templates/me/notice.html

@@ -140,6 +140,8 @@
 			return html;
 		}
 	</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>
 

src/jfw/modules/app/src/web/templates/me/pushMsgSet.html

@@ -68,4 +68,6 @@
 			updateNoticeSwitch();
 		}
 	</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </html>

src/jfw/modules/app/src/web/templates/me/register.html

@@ -159,6 +159,8 @@
 			}
 	</script>
 
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 
 </html>

src/jfw/modules/app/src/web/templates/me/set.html

@@ -177,5 +177,7 @@
 			}
 		}
 	</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/jfw/modules/app/src/web/templates/me/setpwd.html

@@ -137,6 +137,8 @@
 				}
 			}
 		</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 	</body>
 
 </html>

src/jfw/modules/app/src/web/templates/me/solveWay.html

@@ -62,5 +62,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:宋体; 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>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
  </body>
 </html>

src/jfw/modules/app/src/web/templates/me/updatepwd.html

@@ -139,6 +139,8 @@
 			}
 		}
 	</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>
 

src/jfw/modules/app/src/web/templates/staticPage/dataExport_serviceterms.html

@@ -382,5 +382,7 @@
 	</p>
 </p>
 </section>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

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

@@ -188,4 +188,6 @@
 		})
 	</script>
 
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </html>

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

@@ -172,4 +172,6 @@
 				})
 		})
 	</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </html>

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

@@ -136,4 +136,6 @@ body{
            }
        }
 </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </html>

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

@@ -171,4 +171,6 @@
 		})
 	</script>
 
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </html>

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

@@ -169,4 +169,6 @@
 		})
 	</script>
 
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </html>

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

@@ -181,4 +181,6 @@
 		})
 	</script>
 
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </html>

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -910,5 +910,7 @@
 	    JyObj.openExternalLink(href,"");
   })
 </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/jfw/modules/weixin/src/config.json

@@ -2,15 +2,15 @@
     "mongodbServers": "192.168.3.11:27080",
     "mongodbPoolSize": "5",
     "mongodbName": "qfw",
-    "redisServers": "sso=192.168.3.207:3379,other=192.168.3.207:3379,jyop_other=192.168.3.207:3379,push=192.168.3.207:3379",
+    "redisServers": "sso=192.168.3.128:1712,other=192.168.3.128:1712,jyop_other=192.168.3.128:1712,push=192.168.3.128:1712",
     "weixinport": "82",
     "weixinrpcport": "8083",
     "webrpcport": "127.0.0.1:8084",
     "jyop_webrpcport": "127.0.0.1:8012",
     "webdomain": "http://web-jydev-ws.jianyu360.cn",
-    "appid": "wx79f2cc873dbea989",
-    "apptoken": "top2016top2016",
-    "appsecret": "fb3f77e9c6725811b5c39f6d58bd58a3",
+    "appid": "wx5b1c6e7cc4dac0e4",
+    "apptoken": "top2015top2015",
+    "appsecret": "b026103ffebd2291b3edb7a269612112",
     "proxysess": "http://web-jydev-ws.jianyu360.cn/front/sess/%s",
     "followCompany": 10,
     "welcomemsg": "用剑鱼标讯，所有功能完全免费，\n和传统的会员制说再见！\n\n<a href='%s'>点击这里</a>设置关键词，或直接回复“订阅 关键词”，如“订阅 教学设备”，您将随时随地接收招标信息！\n\n剑鱼标讯，让投标无限可能！",

src/web/staticres/wx_dataExport/css/choose_area.scss

@@ -1,116 +0,0 @@
-@import 'public.scss';
-#choose_area{
-	.btn{
-		position: fixed;
-		width: 100%;
-		height: .94rem;
-		bottom: 0;
-		left:0;
-		right:0;
-		line-height: .94rem;
-		color: #fff;
-		font-size: .34rem;
-		display:flex;
-		align-items:center;
-		justify-content:space-between;
-		.save-btn,.reset-btn{
-			flex: 1;
-			width: 50%;
-			text-align: center;
-			height: 100%;
-			font-size: .34rem;
-		}
-		.reset-btn{
-			background: $white;
-			color: $green_1;
-		}
-		.save-btn{
-			background: $green_1;
-			color: #fff;
-		}
-	}
-	.main{
-		.result{
-			padding: .2rem .3rem;
-			font-size:.26rem;
-		}
-		.select-area-box{
-			padding-bottom:.94rem;
-			.tab {
-			  display: flex;
-			  align-items:center;
-			  justify-content:space-between;
-			  color: $black;
-			  background: #fff;
-			  font-size: .3rem;
-			  padding: .2rem .5rem ;
-			  border-bottom: 0.5px solid $border_2;
-			  
-			  .province{
-				  display: flex;
-				  align-items: center;
-				  .checkbox{
-					 width: .4rem;
-					 height:.4rem;
-					 border:1px solid #ddd;
-					 border-radius: 50%;
-					 margin-right: .2rem;
-					 -webkit-appearance: none;
-					 background: #fff;
-				  }
-				  .checkbox:checked{
-				  	border: 0;
-				  	background:url(/wx_dataExport/images/xuanzhong.png) no-repeat center center;
-				  	background-size: 100% 100%;
-				  }
-			  }
-			} 
-			label::after {
-			  font-size: 14px;
-			  float: right;
-			  margin-right: 15px;
-			} 
-			
-			.tab_content {
-			  display: none;
-			  font-size: .28rem;
-			  padding: .1rem .3rem;
-			  text-align: center;
-			  .city{
-				  float: left;
-				  padding: .1rem .2rem;
-				  background: $white;
-				  margin: .1rem;
-			  }
-			  .active{
-				  background: $green_1;
-				  color: $white;
-			  }
-			}
-			.index{
-				padding: .3rem .3rem .1rem .3rem;
-				font-size: .32rem;
-			}
-		}
-		.slide{
-			background: #eee;
-			position: fixed;
-			right: 0;
-			top: 50%;
-			height: 8.5rem;
-			width: .4rem;
-			font-size: .26rem;
-			text-align: center;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			padding: .1rem 0;
-			align-items: center;
-			margin-top: -4.25rem;
-			z-index: 9999;
-			a{
-				margin-bottom: .1rem;
-			}
-		}
-	}
-}

src/web/staticres/wx_dataExport/css/dataExport.scss

@@ -1,159 +0,0 @@
-html{
-    .page{
-        background: #F5F4F9;
-        padding-bottom: .94rem;
-        .progress{
-        	display: flex;
-        	align-items: center;
-        	justify-content: space-around;
-        	padding: .28rem 0;
-        	background:#fff;
-        	border-bottom:1px solid #e0e0e0;
-        	.p-item{
-        		flex: 1;
-        		display: flex;
-        		flex-direction: column;
-        		align-items: center;
-        		position: relative;
-        		.line{
-        			position: absolute;
-        			top: .2rem;
-        			right:-0.92rem;
-        			height: 0.04rem;
-        			width:1.86rem;
-        			background: #DCDADD;
-        		}
-        		.p-item-icon{
-        			width: .48rem;
-        			height: .48rem;
-        			line-height: .48rem;
-        			text-align: center;
-        			border-radius: 50%;
-        			background: #DCDADD;
-        			i{
-        				color: #fff;
-        				font-size: .11rem;
-        			}
-        		}
-        		.icon-gray{
-        			background: #DCDADD;
-        		}
-        		span{
-        			margin-top: 0.06rem;
-        		}
-                .active{
-                    color: #2cb7ca;
-                }
-        	}
-        
-        }
-        
-        .chooseTime{
-            margin-top: .32rem;
-            ul{
-                display: flex;
-                padding:0 .32rem;
-                justify-content: space-between;
-                li{
-                    width: 1.64rem;
-                    height: .64rem;
-                    background: #fff;
-                    border-radius: 3px;
-                    text-align: center;
-                    line-height: .64rem;
-                    a{
-                        font-size: .28rem;
-                        color: #1d1d1d;
-                        display: block;
-                        font-weight: bold;
-                    }
-                }
-                .active{
-                    background: #2cb7ca;
-                    a{
-                        color: #fff;
-                    }
-                }
-            }
-            .dateMake{
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                height: 1.08rem;
-                line-height: 1.08rem;
-                background: #fff;
-                margin-top: .16rem;
-                padding: 0 .3rem;
-                color: #888888;
-                span{
-                    display: inline-block;
-                    width: 2.9rem;
-                    height: .72rem;
-                    line-height: .72rem;
-                    font-size: .3rem;
-                    border: 1px solid #CECECE;
-                    margin: .16rem .2rem;
-                    border-radius: 0.02rem;
-                    i{
-                        padding: 0 .3rem
-                    }
-                }
-            }
-        }
-        .elseChoose{
-            margin-top: 0.3rem;
-            p{
-             font-size: .24rem;
-             color: #888;
-             line-height: .36rem; 
-             padding:0 .4rem;  
-            }
-            .elseChooseList{
-                margin-top: .16rem;
-                ul{
-                    li{
-                        padding:0 .4rem;  
-                        height: .88rem;
-                        line-height: .88rem;
-                        background: #fff;
-                        font-size: 0.3rem;
-                        color: #1d1d1d;
-                        margin-bottom: .24rem;
-                        a{
-                            display: block;
-                            strong{
-                                width: 1.5rem;
-                                font-weight: normal;
-                                float: left;
-                            }
-                            span{
-                                float: left;
-                                width: 4.5rem;
-                                height: .88rem;
-                                color: #686868;
-                                font-size: .26rem;
-                                overflow:hidden;
-                                text-overflow:ellipsis;
-                                white-space:nowrap;
-                                text-align: right;
-                            }
-                            i{
-                                float: right;
-                                color: #707070;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        button{
-            width: 100%;
-            height: 0.94rem;
-            background: #2cb7ca;
-            font-size: .36rem;
-            color: #fff;
-            position: fixed;
-            bottom: 0;
-        }
-    }
-}

src/web/staticres/wx_dataExport/css/industry.scss

@@ -1,90 +0,0 @@
-body{
-    background: #fff;
-    font-size: 0.3rem;
-    padding-bottom: 0.94rem;
-    .industry{
-        .all{
-            margin:0 0.3rem;
-            padding: 0.3rem 0;
-            border-bottom: 1px solid #E0E0E0;
-            span{
-                background: #F4F4F9;
-                display: inline-block;
-                width: 1.58rem;
-                height: .7rem;
-                border-radius: 3px;
-                text-align: center;
-                line-height: .7rem;
-                font-weight: bold;
-            }
-        }
-        .list{
-            ul{
-                li{
-                    margin:0 0.3rem;
-                    padding: 0.3rem 0;
-                    border-bottom: 1px solid #E0E0E0;
-                    dt{
-                        background: #F4F4F9;
-                        display:block;
-                        width: 1.58rem;
-                        height: .7rem;
-                        border-radius: 3px;
-                        text-align: center;
-                        line-height: .7rem;
-                        font-weight: bold; 
-                        margin-bottom: 0.2rem;
-                    }
-                    dd{
-                        background: #F4F4F9;
-                        display: inline-block;
-                        width: 1.58rem;
-                        height: .7rem;
-                        border-radius: 3px;
-                        text-align: center;
-                        line-height: .7rem;
-                        margin-right: .05rem;
-                        margin-bottom: 0.2rem;
-                    }
-                    .active{
-                        background: #2cb7ca;
-                        color: #fff;
-                    }
-                }
-            }
-        }
-        .consfirm{
-            position: fixed;
-            left: 0;
-            bottom: 0;
-            width: 100%;
-            button{
-                width: 100%;
-                height: 0.94rem;
-                background: #2cb7ca;
-                font-size: .36rem;
-                color: #fff;
-            } 
-        }
-        .resetOne{
-            position: fixed;
-            left: 0;
-            bottom: 0;
-            width: 100%;
-            border-top: 1px solid #F4F4F9;
-            display: none;
-            button{
-                width:50%;
-                height: 0.94rem;
-                background: #2cb7ca;
-                font-size: .36rem;
-                color: #fff;
-                float: left;
-            }
-            button:first-child{
-                background: #fff;
-                color: #2cb7ca;
-            }
-        }
-    }
-}

src/web/staticres/wx_dataExport/css/invoice.scss

@@ -1,71 +0,0 @@
-@import 'public.scss';
-#invoice {
-    height: 100%;
-    background: #f5f4f9;
-    .form {
-        .form-item {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            height: 0.88rem;
-            line-height: 0.88rem;
-            margin-top: 0.24rem;
-            padding: 0 0.4rem;
-            background: #fff;
-            .left {
-                font-size: 0.3rem;
-                color: #1d1d1d;
-            }
-            .right {
-                font-size: 0.26rem;
-                color: $gray_1;
-                display: flex;
-                align-items: center;
-                i {
-                    color: #707070;
-                    padding-left: 0.12rem;
-                }
-            }
-        }
-        .form-control {
-            .form-input {
-                height: 0.88rem;
-                line-height: 0.88rem;
-                padding: 0 0.4rem;
-                background: #fff;
-                border-top: 1px solid #eee;
-                input {
-                    width: 100%;
-                    // height: 100%;
-                    font-size: .3rem;
-                }
-            }
-        }
-    }
-    .action {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        width: 100%;
-        height: 0.94rem;
-        line-height: 0.94rem;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        .btn {
-            flex: 1;
-            width: 50%;
-            height: 100%;
-            text-align: center;
-            font-size: 0.36rem;
-        }
-        .cancel-btn {
-            background: #fff;
-            color: $green_1;
-        }
-        .submit-btn {
-            background: $green_1;
-            color: #fff;
-        }
-    }
-}

src/web/staticres/wx_dataExport/css/messageType.scss

@@ -1,101 +0,0 @@
-body{
-    background: #fff;
-    font-size: 0.3rem;
-    padding-bottom: 0.94rem;
-    .industry{
-        .all{
-            margin:0 0.3rem;
-            padding: 0.3rem 0;
-            border-bottom: 1px solid #E0E0E0;
-            span{
-                background: #F4F4F9;
-                display: inline-block;
-                width: 1.58rem;
-                height: .7rem;
-                border-radius: 3px;
-                text-align: center;
-                line-height: .7rem;
-                font-weight: bold;
-            }
-        }
-        .list{
-            ul{
-                li{
-                    margin:0 0.3rem;
-                    padding: 0.3rem 0;
-                    border-bottom: 1px solid #E0E0E0;
-                    dt{
-                        background: #F4F4F9;
-                        display:block;
-                        width: 1.58rem;
-                        height: .7rem;
-                        border-radius: 3px;
-                        text-align: center;
-                        line-height: .7rem;
-                        font-weight: bold; 
-                        margin-bottom: 0.2rem;
-                    }
-                    dd{
-                        background: #F4F4F9;
-                        display: inline-block;
-                        width: 1.58rem;
-                        height: .7rem;
-                        border-radius: 3px;
-                        text-align: center;
-                        line-height: .7rem;
-                        margin-right: .05rem;
-                        margin-bottom: 0.2rem;
-                    }
-                    .active{
-                        background: #2cb7ca;
-                        color: #fff;
-                    }
-                    .question{
-                        display: inline-block; 
-                    }
-                    i{
-                        font-size: .52rem;
-                        color: #2cb7ca;
-                        margin-left: 0.2rem;
-                        position: relative;
-                        top: 0.08rem;
-
-                    }
-                }
-            }
-        }
-        .consfirm{
-            position: fixed;
-            left: 0;
-            bottom: 0;
-            width: 100%;
-            button{
-                width: 100%;
-                height: 0.94rem;
-                background: #2cb7ca;
-                font-size: .36rem;
-                color: #fff;
-            } 
-        }
-        .resetOne{
-            position: fixed;
-            left: 0;
-            bottom: 0;
-            width: 100%;
-            border-top: 1px solid #F4F4F9;
-            display: none;
-            button{
-                width:50%;
-                height: 0.94rem;
-                background: #2cb7ca;
-                font-size: .36rem;
-                color: #fff;
-                float: left;
-            }
-            button:first-child{
-                background: #fff;
-                color: #2cb7ca;
-            }
-        }
-    }
-}

src/web/staticres/wx_dataExport/css/money.css

@@ -57,6 +57,9 @@ body .industry .resetOne {
   bottom: 0;
   width: 100%;
   border-top: 1px solid #F4F4F9;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
 }
 body .industry .resetOne button {
   width: 50%;
@@ -65,6 +68,7 @@ body .industry .resetOne button {
   font-size: .36rem;
   color: #fff;
   float: left;
+    flex: 1;
 }
 body .industry .resetOne button:first-child {
   background: #fff;

src/web/staticres/wx_dataExport/css/money.scss

@@ -1,75 +0,0 @@
-body{
-    background: #fff;
-    font-size: 0.3rem;
-    padding-bottom: 0.94rem;
-    .industry{
-        .all{
-            padding: 0.3rem ;
-            border-bottom: 1px solid #E0E0E0;
-            span{
-                background: #F4F4F9;
-                display: inline-block;
-                width: 1.58rem;
-                height: .7rem;
-                border-radius: 3px;
-                text-align: center;
-                line-height: .7rem;
-                font-weight: bold;
-            }
-        }
-        .connect{
-            h3{
-                font-size: .26rem;
-                color: #686868;
-                line-height: 1.08rem;
-                font-weight: normal;
-                padding:0 0.3rem ;
-            }
-            .connectMain{
-                height: 1.08rem;
-                background: #F5F4F9;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                color: #888;
-                span{
-                    line-height: .72rem;
-                    background: #fff;
-                    display: inline-block;
-                    width: 3.2rem;
-                    height: .72rem;
-                    margin: 0 0.1rem;
-                    border: 1px solid #CECECE;
-                    input{
-                        width: 2rem;
-                        text-indent: 0.1rem;
-                    }
-                }
-            }
-            
-            
-            
-        }
-       
-
-        .resetOne{
-            position: fixed;
-            left: 0;
-            bottom: 0;
-            width: 100%;
-            border-top: 1px solid #F4F4F9;
-            button{
-                width:50%;
-                height: 0.94rem;
-                background: #2cb7ca;
-                font-size: .36rem;
-                color: #fff;
-                float: left;
-            }
-            button:first-child{
-                background: #fff;
-                color: #2cb7ca;
-            }
-        }
-    }
-}

src/web/staticres/wx_dataExport/css/no_result.scss

@@ -1,33 +0,0 @@
-@import 'public.scss';
-#no_result{
-	.main{
-		position:fixed;
-		top:0;
-		bottom:0;
-		left:0;
-		right:0;
-		width:100%;
-		height:100%;
-		display: flex;
-		align-items: center;
-		flex-direction: column;
-		justify-content: center;
-		img{
-			width: 2.8rem;
-			height: 2.8rem;
-		}
-		p{
-			color: #888;
-			font-size: .28rem;
-			margin-top: .2rem;
-		}
-		a{
-			color: #2CB7CA;
-			font-size: .36rem;
-			margin-top: .48rem;
-		}
-		a:hover,a:focus{
-			color:#2CB7CA;
-		}
-	}
-}

src/web/staticres/wx_dataExport/css/order_detail.css

@@ -47,7 +47,7 @@
   justify-content: flex-start;
   padding: 0 .4rem;
   margin-bottom: .16rem;
-  height:0.384rem;
+/*  height:0.384rem;*/
 }
 #order_detail .main .lists .card .card-content .item-list label {
   font-weight: 500;

src/web/staticres/wx_dataExport/css/order_detail.scss

@@ -1,94 +0,0 @@
-@import 'public.scss';
-#order_detail{
-	.main{
-		.lists{
-			margin-bottom:1.26rem;
-			.card{
-				.card-header{
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					padding: .4rem .3rem;
-					img{
-						width:36%;
-						flex:1;
-					}
-					h3{
-						font-size: .36rem;
-						color: $black;
-						margin: 0 .2rem;
-					}
-				}
-				.card-content{
-					.text{
-						padding: 0.04rem .4rem;
-						font-size: .28rem;
-						margin-bottom: .12rem;
-					}
-					.item-list{
-						display: flex;
-						justify-content: flex-start;
-						padding: 0 .4rem;
-						margin-bottom: .16rem;
-						label{
-							font-weight: bold;
-							font-size: .28rem;
-							display: block;
-							white-space: nowrap;
-						}
-						.item-list-parents{
-							display: flex;
-							flex-wrap: wrap;
-							justify-content: flex-start;
-							li{
-								margin-right: 0.1rem;
-								font-size: .28rem;
-								color: $gray_1;
-							}
-						}
-					}
-				}
-                .invoicing{
-                    padding: 0 .12rem;
-                    border: 1px solid $green_1;
-                    border-radius: 0.06rem;
-                    font-size: .28rem;
-                    color: $green_1;
-                }
-                .unit p{
-                    display: flex;
-                    padding: 0.04rem .4rem;
-                    font-size: .28rem;
-                    span:nth-child(2){
-                        flex: 1
-                    }
-                }
-                .person p{
-                    display: flex;
-                    padding: 0.04rem .4rem;
-                    font-size: .28rem;
-                    span:nth-child(2){
-                        flex: 1
-                    }
-                }
-			}
-			.button{
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				right: 0;
-				z-index: 99;
-				width: 100%;
-				height: .94rem;
-				line-height: .94rem;
-				text-align: center;
-				font-size: .36rem;
-				margin-top: .4rem;
-			}
-			.align{
-				background: $green_1;
-				color: $white;
-			}
-		}
-	}
-}

src/web/staticres/wx_dataExport/css/order_list.scss

@@ -1,116 +0,0 @@
-@import 'public.scss';
-#order_list{
-	.main{
-		.buttons-tab>ul{
-			width: 100%;
-			height: 1rem;
-			line-height:1rem;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 0 .3rem;
-			background: $white;
-			border-bottom: 1px solid $border_2;
-			box-sizing: border-box;
-			.tab-link{
-				display: block;
-				flex: 1;
-				text-align: center;
-				color: $black;
-				font-size: .34rem;
-				box-sizing: border-box;
-				height:99%;
-			}
-			.active{
-				color: $green_1;
-				border-bottom: 2px solid $green_1;
-				box-sizing: border-box;
-			}
-		}
-		.tabs{
-			.card{
-				background: $white;
-				margin-top: .2rem;
-				.card-header{
-					height: .82rem;
-					line-height: .82rem;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					padding: 0 .3rem;
-					border-bottom: 0.01rem solid $border_2;
-					.time{
-						font-size: .24rem;
-					}
-					.status{
-						font-size: .3rem;
-					}
-					.notpay{
-						color: $yellow;
-					}
-					.finish{
-						color: $gray_1;
-					}
-				}
-				.card-content{
-					border-bottom: 0.01rem solid $border_2;
-					.media{
-						display: flex;
-						background: #F5F4F9;
-						padding: .22rem .2rem;
-						margin: .16rem .3rem;
-						.media-img{
-							width: 1.15rem;
-							height: 1.15rem;
-							margin-right: .2rem;
-						}
-						.item-ifo{
-							font-size: .26rem;
-							color: $black;
-						}
-					}
-					.price{
-						display: flex;
-						justify-content: flex-end;
-						align-items: center;
-						padding: 0 .3rem;
-						margin-bottom: .2rem;
-						.initial{
-							font-size: .26rem;
-							color: $gray_2;
-							text-decoration: line-through;
-							margin-right: 0.08rem;
-						}
-						.current{
-							font-size: .36rem;
-						}
-					}
-				}
-				.card-footer{
-					display: flex;
-					justify-content: flex-end;
-					align-items: center;
-					padding: .2rem .3rem;
-					.btn{
-						width: 2.18rem;
-						height: .72rem;
-						line-height: .72rem;
-						text-align: center;
-						border-radius: 0.05rem;
-						font-size: .28rem;
-					}
-					.cancle{
-						border: 1px solid $green_1;
-						color: $green_1;
-						background: transparent;
-						margin-right: .16rem;
-					}
-					.pay{
-						background: $green_1;
-						color: #fff;
-					}
-				}
-			}
-		}
-	}
-}

src/web/staticres/wx_dataExport/css/pay_order.scss

@@ -1,351 +0,0 @@
-@import 'public.scss';
-#pay_order{
-    padding-bottom: .94rem;
-	.main{
-		.progress{
-			display: flex;
-			align-items: center;
-			justify-content: space-around;
-			padding: .28rem 0;
-			background:$white;
-			border-bottom:1px solid $border_2;
-			.p-item{
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				position: relative;
-				.line{
-					position: absolute;
-					top: .2rem;
-					right:-0.92rem;
-					height: 0.04rem;
-					width:1.86rem;
-					background: #DCDADD;
-				}
-				.p-item-icon{
-					width: .48rem;
-					height: .48rem;
-					line-height: .48rem;
-					text-align: center;
-					border-radius: 50%;
-					background: #2CB7CA;
-					i{
-						color: #fff;
-						font-size: .11rem;
-					}
-				}
-				.icon-gray{
-					background: #DCDADD;
-				}
-				span{
-					margin-top: 0.06rem;
-				}
-                .active{
-                    color: $green_1;
-                }
-			}
-			
-		}
-	
-		.form{
-			.form-item{
-				background: $white;
-				.label-title{
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					padding: .28rem .3rem;
-					.left{
-						font-size: .26rem;
-						color: $black;
-                        font-weight: bold;
-						strong{
-							color: $green_1;
-							font-size: .32rem;
-							padding: 0 0.08rem;
-						}
-					}
-					.right{
-						color: $green_1;
-						font-size: .3rem;
-					}
-				}
-				.choose{
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					padding: 0 .3rem;
-					.choose-item{
-						position: relative;
-						width: 48%;
-						height: 1.25rem;
-						display: flex;
-						align-items: center;
-						flex-direction: column;
-						justify-content: center;
-						border-radius: .08rem;
-						border: 1px solid $border_2;
-						h2{
-							font-size: .3rem;
-							margin-bottom: 0.08rem;
-							.crown{
-								font-size: .24rem;
-								font-weight: normal;
-								color: $border_2;
-							}
-						}
-						p{
-							font-size: .24rem;
-							color: $gray_2;
-							letter-spacing: 0.02rem;
-						}
-						.initial{
-							text-decoration: line-through;
-						}
-						.mark{
-							position: absolute;
-							width: .48rem;
-							height: .36rem;
-							top: 0;
-							right: 0;
-							color: $green_1;
-							display: none;
-						}
-					}
-					.active{
-						border: 1px solid $green_1;
-					}
-					.active h2{
-						color: $green_1;
-					}
-					.active h2 .crown{
-						color: $yellow;
-					}
-					.active .mark{
-						display: block;
-					}
-				}
-				.tips{
-					display: flex;
-					align-items: center;
-					padding: .2rem .4rem;
-					color: $gray_2;
-					.tips-icon{
-						color: $green_1;
-						font-size: .32rem;
-						font-weight: bold;
-						margin-left: .1rem;
-					}
-				}
-				.form-control{
-					height: .88rem;
-					line-height: .88rem;
-					display: flex;
-					align-items: center;
-					font-size: .28rem;
-					color: $gray_2;
-					margin-left: .3rem;
-					border-bottom: 1px solid $border_2;
-					.on{
-						color: $gray_2;
-					}
-					.input{
-						flex: 1;
-						padding: 0 .3rem;
-						display: flex;
-						input[type='text']{
-							height: 100%;
-							width: 100%;
-						}
-						input[type='number']{
-							flex: 1;
-						}
-						button{
-							background: transparent;
-							color: $green_1;
-							font-size: .3rem;
-						}
-					}
-				}
-				.way{
-                    position: relative;
-					height: .88rem;
-					line-height: .88rem;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					font-size: .3rem;
-					padding: 0 .3rem;
-					span:nth-child(1){
-						color: $gray_2;
-					}
-					.way-right{
-                        display: flex;
-                        align-items: center;
-                        span{
-                           color: $black; 
-                           padding-right: .1rem;
-                        }
-						.icon-right{
-						    color: #C2C2C2;
-						    font-size: .26rem;
-						}
-					}
-				}
-			}
-			.msg{
-				padding: .33rem .4rem .16rem;
-				color: $gray_2;
-			}
-			.radio-form{
-				background: transparent;
-				padding: .2rem .3rem;
-				border: 0;
-				margin: 0;
-				.weui-cell{
-					padding: 0;
-				}
-				.weui-cell__hd{
-					transform: scale(0.8);
-				}
-				.read{
-					font-size: .26rem;
-					a{
-						color: $green_1;
-					}
-				}
-                .weui-check:checked +.weui-icon-checked:before{
-                    color: $green_1;
-                }
-			}
-			.price{
-				display: flex;
-				align-items: center;
-				justify-content: flex-end;
-				padding: .2rem .3rem;
-				span{
-					text-decoration: line-through;
-					font-size: .26rem;
-					color: $gray_2;
-					margin-right: .18rem;
-				}
-				strong{
-					font-size: .4rem;
-					color: $black;
-				}
-			}
-			.form-btn{
-				display: flex;
-				align-items: center;
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				right: 0;
-				z-index: 99;
-				.btn{
-					flex: 1;
-					height: .94rem;
-					line-height: .94rem;
-					text-align: center;
-					font-size: .36rem;
-				}
-				.prew{
-					background: $white;
-					color: $green_1;
-				}
-				.enter{
-					background: $green_1;
-					color: $white;
-				}
-                .enter[disabled]{
-                    background: $border_2;
-                }
-			}
-		}
-	}
-	// weui组件样式
-	#tipDialog{
-		text-align: left;
-		.dialog-title{
-			font-size: .34rem;
-		}
-		.info{
-			li{
-				text-align: left!important;
-				font-size: .28rem;
-				label{
-					display: block;
-					font-weight: bold;
-					margin: .24rem 0; 
-				}
-				p{
-					font-size: .28rem;
-					line-height: 1.4;
-				}
-			}
-		}
-        
-		.weui-dialog__btn_primary{
-			color: $green_1;
-		}
-	}
-    .pay_way{
-        .box{
-            position:fixed;
-            bottom: 0;
-            left: 0;
-            width: 100%;
-            background: #fff;
-            height: 4.8rem;
-            z-index: 9999;
-            .box_hd{
-                padding: 0 .4rem;
-                height: .88rem;
-                line-height: .88rem;
-                background: #F4F4F9;
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                border-bottom: 1px solid #eee;
-                h3{
-                    color: #1D1D1D;
-                    font-size: .32rem;
-                }
-                .cancel{
-                    color: $green_1;
-                    font-size: .32rem;
-                }
-            }
-            .box_bd{
-                .weui-cells:after{
-                    border: 0;
-                } 
-                .weui-cells:before{
-                    border: 0;
-                }
-                .weui-cell:before{
-                    border: 0;
-                }
-                .choose-form{
-                    margin: 0;
-                }
-                .wx_label,.zfb_label{
-                    margin-top: .68rem;
-                    padding: 0 .3rem;
-                }
-                p{
-                    font-size: .32rem;
-                }
-                img{
-                    width: .8rem;
-                    height: .8rem;
-                    margin-right: .3rem;
-                }
-                .weui-check:checked +.weui-icon-checked:before{
-                    color: $green_1;
-                }
-            }
-        }
-    }
-}

src/web/staticres/wx_dataExport/css/pay_success.scss

@@ -1,110 +0,0 @@
-@import 'public.scss';
-#pay_success{
-	width: 100%;
-	height: 100%;
-	background: #fff;
-	.main{
-		padding-bottom: .94rem;
-		.progress{
-			display: flex;
-			align-items: center;
-			justify-content: space-around;
-			padding: .24rem 0;
-			.p-item{
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				position: relative;
-				.line{
-					position: absolute;
-					top: .2rem;
-					right:-0.92rem;
-					height: 0.04rem;
-					width:1.86rem;
-					background: #2CB7CA;
-				}
-				.p-item-icon{
-					width: .48rem;
-					height: .48rem;
-					line-height: .48rem;
-					text-align: center;
-					border-radius: 50%;
-					background: #2CB7CA;
-					i{
-						color: #fff;
-						font-size: .11rem;
-					}
-				}
-				span{
-					margin-top: 0.06rem;
-				}
-			}
-			
-		}
-		.space{
-			width: 100%;
-			height: .2rem;
-			background: rgba(245,244,249,1);
-		}
-		.result{
-			width: 100%;
-			.success{
-				display: flex;
-				align-items: center;
-				flex-direction: column;
-				justify-content: center;
-				padding: .56rem 0;
-			}
-			i{
-				font-size: 1.6rem;
-				color: #2CB7CA;
-			}
-			h2{
-				color: #2CB7CA;
-				font-size: .48rem;
-				margin: .24rem 0 .16rem;
-			}
-			p{
-				font-size: .28rem;
-				color: #888;
-			}
-		}
-		.order_lists{
-			border-top: 1px solid rgba(224,224,224,1);
-			border-bottom:1px solid rgba(224,224,224,1);
-			padding: 0 .4rem;
-			.item{
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				// padding: .24rem 0;
-                height: .88rem;
-                line-height: .88rem;
-				border-bottom: 1px solid rgba(224,224,224,1);
-				color: #666;
-			}
-			.item:last-child{
-				border: 0;
-			}
-		}
-		
-	}
-	.main::-webkit-scrollbar {
-	        display: none;
-	}
-	.go_detail{
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		z-index: 999;
-		display: block;
-		background: #2CB7CA;
-		color: #fff;
-		width: 100%;
-		height: .94rem;
-		line-height: .94rem;
-		text-align: center;
-		font-size: .36rem;
-	}
-}

src/web/staticres/wx_dataExport/css/preview_data.scss

@@ -1,46 +0,0 @@
-@import 'public.scss';
-#preview_data{
-	.main{
-		.buttons-tab>ul{
-			width: 100%;
-			height: 1rem;
-			line-height:1rem;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 0 .6rem;
-			background: $white;
-			border-bottom: 1px solid $border_2;
-			box-sizing: border-box;
-			.tab-link{
-				display: block;
-				flex: 1;
-				text-align: center;
-				color: $black;
-				font-size: .34rem;
-				box-sizing: border-box;
-				height:99%;
-			}
-			.active{
-				color: $green_1;
-				border-bottom: 2px solid $green_1;
-				box-sizing: border-box;
-			}
-		}
-		.tabs{
-			.tab{
-				padding: .2rem;
-			}
-			.table{
-				width: 100%;
-				td{
-					text-align: center;
-					white-space: pre-wrap;
-					font-size: .1rem;
-					border: 0.01rem solid $border_2;
-					padding: 0.08rem;
-				}
-			}
-		}
-	}
-}

src/web/staticres/wx_dataExport/css/public.scss

@@ -1,61 +0,0 @@
-// 主色
-
-$gray-button:#f5f4f9;
-$white:#fff;
-// 分割线颜色
-$border_1:#cecece;
-$border_2:#e0e0e0;
-// 文字色
-$black:#1d1d1d;
-$gray_1:#686868;
-$gray_2:#888;
-$blue:#0987ff;
-$yellow:#ffb900;
-$green_1:#2cb7ca;
-$green_2:#25c78c;
-$red:#fe737a;
-// .header{
-// 	width: 100%;
-// 	height: .88rem;
-// 	line-height: .88rem;
-// 	background:$white;
-// 	position: fixed;
-// 	top: 0;
-// 	left: 0;
-// 	z-index: 999;
-// 	padding: 0 .3rem;
-// 	border-bottom: 1px solid $border_1;
-// 	.return{
-// 		position: relative;
-// 		display: block;
-// 		z-index: 22;
-// 		i{
-// 			font-size: .42rem;
-// 		}
-// 	}
-// 	.title{
-// 		position: absolute;
-// 		top: 0;
-// 		left: 0;
-// 		right: 0;
-// 		width: 100%;
-// 		padding: 0;
-// 		font-size: 0.38rem;
-// 		font-weight: 500;
-// 		color: #3d4145;
-// 		text-align: center;
-// 		white-space: nowrap;
-// 	}
-// }
-.main{
-// 	position: fixed;
-// 	top: .88rem;
-// 	bottom: 0;
-// 	left: 0;
-// 	right:0;
-	width:100%;
-	overflow: scroll;
-}
-.main::-webkit-scrollbar {
-	display: none;
-}

src/web/staticres/wx_dataExport/css/submit_success.scss

@@ -1,33 +0,0 @@
-@import 'public.scss';
-.submit_success{
-    height: 100%;
-    .success{
-    	display: flex;
-    	align-items: center;
-    	flex-direction: column;
-    	justify-content: center;
-    	padding: 2rem 0;
-        i{
-        	font-size: 1.6rem;
-        	color: #2CB7CA;
-        }
-        h2{
-        	color: #2CB7CA;
-        	font-size: .48rem;
-        	margin: .24rem 0 .16rem;
-        }
-    }
-    .go_back{
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        width: 100%;
-        height: .94rem;
-        line-height: .94rem;
-        background: $green_1;
-        color: #fff;
-        font-size: .36rem;
-        text-align: center;
-    }
-    
-}

src/web/staticres/wx_dataExport/css/win_bid.scss

@@ -1,126 +0,0 @@
-@import 'public.scss';
-.win_bid{
-	.main{
-		.query{
-			display: flex;
-			align-items: center;
-			justify-content: flex-end;
-			padding: .3rem;
-			color: $green_1;
-			font-size: .3rem;
-			i{
-				font-size: .4rem;
-				margin-left: .1rem;
-			}
-		}
-		.form{
-			.form-item{
-				padding: .3rem;
-				margin:.2rem 0;
-				background: $white;
-				input{
-					width:100%;
-					height: 100%;
-					font-size: .28rem;
-				}
-			}
-			.btn{
-				width: 100%;
-				height: .94rem;
-				background: $green_1;
-				color: $white;
-				font-size: .34rem;
-				text-align: center;
-			}
-		}
-		.form-edit{
-			.item-control{
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				background: #fff;
-				height: .88rem;
-				line-height: .88rem;
-				padding: 0 .3rem;
-				margin-top: .2rem;
-				input{
-					height: 100%;
-					flex: 1;
-					background: transparent;
-					font-size: .28rem;
-				}
-				.edit{
-					display: flex;
-					align-items: center;
-					color: $green_1;
-					height: .4rem;
-					padding: 0 .2rem;
-					border-left: 1px solid $border_2;
-					i{
-						margin-right: .1rem;
-					}
-				}
-			}
-			.item-btn{
-				width: 100%;
-				height: .88rem;
-				height: .88rem;
-				text-align: center;
-				margin-top: .1rem;
-				display: none;
-				.btn{
-					width: 50%;
-					height: 100%;
-					flex: 1;
-					color: $white;
-					float: left;
-					font-size:.3rem;
-				}
-				.del{
-					background: $red;
-				}
-				.enter{
-					background: $green_1;
-				}
-			}
-		}
-		.add{
-			width: 1rem;
-			height: 1rem;
-			display: block;
-			position: fixed;
-			bottom: .72rem;
-			left: 50%;
-			margin-left: -.5rem;
-			img{
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-	// weui组件样式
-	#tipDialog{
-		text-align: left;
-		.dialog-title{
-			font-size: .34rem;
-		}
-		.info{
-			li{
-				text-align: left!important;
-				font-size: .28rem;
-				label{
-					display: block;
-					font-weight: bold;
-					margin: .24rem 0; 
-				}
-				p{
-					font-size: .28rem;
-					line-height: 1.4;
-				}
-			}
-		}
-		.weui-dialog__btn_primary{
-			color: $green_1;
-		}
-	}
-}

src/web/templates/active/jyswitch/index.html

@@ -26,6 +26,8 @@
 <p><a id="sealSwitch" href="/active/jyswitch/seal">盖章活动开关控制</a></p>
 
 </div>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>
 

src/web/templates/active/jyswitch/seal.html

@@ -99,6 +99,8 @@
 <div class="btn" id="three"><span v="3">关闭推送</span></div>
 
 </div>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>
 

src/web/templates/active/saofu.html

@@ -140,5 +140,7 @@ center{
 	</center>
 	<div class="text">瓜分2个亿，小伙伴们互扫起来吧！</div>
 	<div class="bottom"></div>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/web/templates/active/share.html

@@ -122,6 +122,8 @@ body{
 		回复<font class="keyword">“刮奖”</font>即可参加剑鱼标讯金秋刮刮乐
 	</div>
 	<div id="test"></div>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </div>
 </body>
 </html>

src/web/templates/active/winningrecord.html

@@ -50,5 +50,7 @@
 	{{.T.data.s_prize}}
 </div>
 {{end}}
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/web/templates/active/zqluckdraw.html

@@ -856,5 +856,7 @@ body, html {
 	</script>
 	<script src="{{Msg "seo" "cdn"}}/zqluckdraw/js/global.js"></script>
 	<script src="{{Msg "seo" "cdn"}}/zqluckdraw/js/aio.js"></script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/web/templates/common/baiducc.html

@@ -6,4 +6,14 @@ var _hmt = _hmt || [];
 	var s = document.getElementsByTagName("script")[0]; 
 	s.parentNode.insertBefore(hm, s);
 })();
+</script>
+
+<script>
+var _hmt = _hmt || [];
+(function() {
+  var hm = document.createElement("script");
+  hm.src = "https://hm.baidu.com/hm.js?72331746d85dcac3dac65202d103e5d9";
+  var s = document.getElementsByTagName("script")[0]; 
+  s.parentNode.insertBefore(hm, s);
+})();
 </script>

src/web/templates/pc/createOrderPage.html

@@ -558,5 +558,7 @@
 	});
 </script>
 {{include "/common/pcbottom.html"}}
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/web/templates/pc/dataExport_noDataErr.html

@@ -56,5 +56,7 @@ $(function(){
 	});
 })
 </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/web/templates/pc/dataService.html

@@ -177,6 +177,8 @@
           </div>
       </div>
     </div>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 <script>
 $(function(){

src/web/templates/pchelper/login.html

@@ -376,5 +376,7 @@
 			}
 		}
 	</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/web/templates/pchelper/pushView.html

@@ -897,5 +897,7 @@
 		}
 	});
 </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/web/templates/staticpage/serviceterms.html

@@ -382,5 +382,7 @@
 	</p>
 </p>
 </section>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/web/templates/staticpage/wx-serviceterms.html

@@ -382,5 +382,7 @@
 	</p>
 </p>
 </section>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/web/templates/weixin/applysub/index.html

@@ -38,5 +38,7 @@
 			<a  class="button">继续申请</a>
 		</div>
 		
+	<!--百度统计end-->
+	{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/web/templates/weixin/applysub/infoPage.html

@@ -347,4 +347,6 @@
         $(".input_company .company_name").hide();
 	}
 	</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </html>

src/web/templates/weixin/dataExport/404.html

@@ -16,5 +16,6 @@
 				<a href="javascript:history.go(-1)">返回筛选</a>
 			</main>
 		</div>
+	{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/web/templates/weixin/dataExport/dataExPort.html

@@ -598,6 +598,7 @@
     })
 </script>
     
+	{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/web/templates/weixin/dataExport/dataExport_appended.html

@@ -378,6 +378,7 @@
         })
 
     </script>
+	{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/web/templates/weixin/dataExport/dataExport_appendedInput.html

@@ -185,6 +185,7 @@
         })
 
     </script>
+	{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/web/templates/weixin/dataExport/dataExport_applyInvoice.html

@@ -268,5 +268,6 @@
 			}
             
         </script>
+	{{include "/common/baiducc.html"}}
     </body>
 </html>

src/web/templates/weixin/dataExport/dataExport_area.html

@@ -37,7 +37,7 @@
 				<div class="select-area-box">
 				<ul>
 				<li >
-				<div class="tab whole">
+				<div class="tab whole selected">
 				<div class="province">
 				<input type="checkbox" class="checkbox other">全国
 				</div>
@@ -408,6 +408,9 @@
 				// 如果循环结束仍为true说明 没有全部都被选中
 				if (_f) {
 					$('.other').prop('checked', true);
+					$(".reset-btn").hide();
+				}else{
+					$(".reset-btn").show();
 				}
 			}
 			$(".select-area-box ul li:not('.index')").each(function(){
@@ -461,11 +464,13 @@
 					 }
 				 });
 				 $('.other').on('change',function(){
-					 var checked = $(this).is(':checked');
-					 if(checked){
+					var checked = $(this).is(':checked');
+					$(this).prop("checked",true);
+					$(".reset-btn").hide();
+					if(checked){
 						 $('.tab:not(.whole)').removeClass('selected').children('.province').find('input').prop('checked', false);
 						 $('.tab_content').find('.city').removeClass('active')
-					 }
+					}
 				 });
 				
 				$('.save-btn').click(function(){
@@ -516,7 +521,10 @@
 				$('.reset-btn').click(function(){
 					$('input[type="checkbox"]').attr("checked",false);
 					$('.tab_content .city').removeClass('active');
-					$('.result_name').empty()
+					$('.result_name').empty();
+					$(".whole").addClass("selected");
+					$(".other").prop("checked",true);
+					$(".reset-btn").hide();
 				});
 				 //
 				 if(localStorage.area !== "" && localStorage.area!==undefined){
@@ -532,10 +540,14 @@
 						 })
 					 }
 					 if(localStorage.area === "全国"){
+						$(".reset-btn").hide();
 						 $(".other").prop("checked", true);
-					 }
+					 }else{
+						$(".reset-btn").show();
+					}
 				 }else{
 					 $(".other").prop("checked", true);
+					$(".reset-btn").hide();
 				 }
 				 //
 				 $(".tab_content").find(".city.active").each(function(){
@@ -545,5 +557,6 @@
 
 			})
 		</script>
+	{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/web/templates/weixin/dataExport/dataExport_buyerEdit.html

@@ -85,6 +85,7 @@
 
 </script>
 
+	{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/web/templates/weixin/dataExport/dataExport_buyerInput.html

@@ -127,6 +127,7 @@
 
     </script>
 
+	{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/web/templates/weixin/dataExport/dataExport_exclude.html

@@ -379,6 +379,7 @@
         })
 
     </script>
+	{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/web/templates/weixin/dataExport/dataExport_excludeInput.html

@@ -200,6 +200,7 @@
         })
 
     </script>
+	{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/web/templates/weixin/dataExport/dataExport_industry.html

@@ -207,23 +207,28 @@
 
         });
         $('.all').on('click',function(){
+            $(".consfirm").show();
+            $(".resetOne").hide();
             if($(".all span").hasClass('active')){
             //     $('.list ul li dl dt').addClass('active');
             //     $('.list ul li dl dd').addClass('active')
             // }else{
                 $('.list ul li dl dt').removeClass('active');
-                $('.list ul li dl dd').removeClass('active')
+                $('.list ul li dl dd').removeClass('active');
             }
         });
 
         $('.reset').on('click',function(){
+            $(".consfirm").show();
+            $(".resetOne").hide();
+			$(".all span").addClass('active');
             $('.list ul li dl dt').removeClass('active');
             $('.list ul li dl dd').removeClass('active');
         });
         //
         $(".all span").on('click', function () {
             if($(this).hasClass('active')){
-                $(this).removeClass('active');
+                //$(this).removeClass('active');
             }else{
                 $(this).addClass('active');
             }
@@ -262,6 +267,8 @@
                 })
             }
             $(".list ul li").find("dd.active").each(function(){
+	            $(".consfirm").hide();
+	            $(".resetOne").show();
                 $(".all span").removeClass("active")
             })
         }
@@ -289,5 +296,6 @@
         //
 
     </script>
+	{{include "/common/baiducc.html"}}
 </body>
 </html>

src/web/templates/weixin/dataExport/dataExport_invoiceSuccess.html

@@ -50,5 +50,6 @@
 //	　　　　　　 window.history.forward(1);
 //		　　 });
         </script>
+	{{include "/common/baiducc.html"}}
     </body>
 </html>

src/web/templates/weixin/dataExport/dataExport_keyWord.html

@@ -276,6 +276,7 @@
 
 
     </script>
+	{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/web/templates/weixin/dataExport/dataExport_keyWordInput.html

@@ -185,6 +185,7 @@
     });
 
 </script>
+	{{include "/common/baiducc.html"}}
 </body>
 
 </html>

src/web/templates/weixin/dataExport/dataExport_payOrder.html

@@ -616,5 +616,6 @@
 				}
 			}
         </script>
+	{{include "/common/baiducc.html"}}
     </body>
 </html>

src/web/templates/weixin/dataExport/dataExport_paySuccess.html

@@ -19,6 +19,13 @@
 				payTime =  payTime.split("-")[0]+"年"+payTime.split("-")[1]+"月"+payTime.split("-")[2]+"日";
 				$(".payTime").text(payTime);
 			})
+			function detail(){
+				//if (window.location.href.indexOf("detail")>0){
+				//	window.history.back(-1);
+				//}else{
+					window.location.href="/weixin/pay/wxToOrderDetail?orderCode={{.T.orderCode}}"
+				//}
+			}
 		</script>
 	</head>
 	<body>
@@ -76,7 +83,8 @@
 					</div>
 				</div>
 			</main>
-			<a href="/weixin/pay/wxToOrderDetail?orderCode={{.T.orderCode}}" class="go_detail">查看订单</a>
+			<a onclick="detail()" class="go_detail">查看订单</a>
 		</div>
+	{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/web/templates/weixin/dataExport/dataExport_previewData.html

@@ -55,5 +55,6 @@
 				})
 			})
 		</script>
+	{{include "/common/baiducc.html"}}
 	</body>
 </html>

src/web/templates/weixin/dataExport/dataExport_price.html

@@ -45,11 +45,21 @@
     </div>
 <script>
     initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
-    $(function () {
-        $("input").on('change', function () {
-            $(".industry .all span").removeClass("active");
-        });
-
+    $(function () {		
+		$(".connectMain input").bind("input propertychange",function(event){
+			var priceVal_min = $("#min").val();
+			var priceVal_max = $("#max").val();
+			if (priceVal_min!=""&&priceVal_max!=""){
+				if (parseInt(priceVal_max)<parseInt(priceVal_min)){
+					$("#min").val(parseInt(priceVal_max));
+					$("#max").val(parseInt(priceVal_min));
+				}
+			}
+			$(".reset").show();
+		}).bind("input focus",function(e){
+			$(".industry .all span").removeClass("active");
+			$(".connectMain").css("background","#2cb7ca");
+		});
         $(".industry .all span").on('click', function () {
             $(this).addClass("active")
             $(".connectMain").css("background", "#f5f4f9");
@@ -75,6 +85,7 @@
             $(".all span").addClass("active");
             $("#min").val("");
             $("#max").val("");
+			$(".reset").hide();
         });
         //
         if(localStorage.price !== ""&&localStorage.price!==undefined){
@@ -82,11 +93,13 @@
             //只有一个金额
 			if(price[0]!=""){
 				$("#min").val(price[0]);
+				$(".reset").show();
 			}else{
 				$("#min").val();
 			}
 			if(price[1]!=""){
 				$("#max").val(price[1]);
+				$(".reset").show();
 			}else{
 				$("#max").val();
 			}
@@ -98,10 +111,13 @@
             if($("#min").val() !== "" || $("#max").val() !== ""){
                 $(".connectMain").css("background", "#2cb7ca");
                 $(".all span").removeClass("active");
-            }
+            }else{
+				$(".reset").hide();
+			}
         }
 
     })
 </script>
+	{{include "/common/baiducc.html"}}
 </body>
 </html>