订阅周期弹窗按钮高度

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_purchase.css

@@ -741,7 +741,7 @@
 }
 
 .vip_purchase .time_cycle .box_bd .bd_select {
-  padding: .62rem .4rem .64rem;
+  padding: .54rem .4rem .64rem;
 }
 
 .vip_purchase .time_cycle .box_bd .bd_select .choose-form {

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

@@ -8,11 +8,11 @@
     "weixinrpcport": "8083",
     "webrpcport": "127.0.0.1:8084",
     "jyop_webrpcport": "127.0.0.1:8012",
-    "webdomain": "http://web-jydev-wss.jianyu360.cn",
-    "appid": "wx5b1c6e7cc4dac0e4",
-    "apptoken": "top2015top2015",
-    "appsecret": "b026103ffebd2291b3edb7a269612112",
-    "proxysess": "http://web-jydev-wss.jianyu360.cn/front/sess/%s",
+    "webdomain": "http://web-jydev-tsz.jianyu360.cn",
+	"appid": "wxfa161ce88ab7584e",
+	"apptoken": "top2015top2015",
+	"appsecret": "4776638e01eda5f44780dc2abfebb236",
+	"proxysess": "http://web-jydev-tsz.jianyu360.cn/front/sess/%s",
     "followCompany": 10,
     "welcomemsg": "用剑鱼标讯，所有功能完全免费，\n和传统的会员制说再见！\n\n<a href='%s'>点击这里</a>设置关键词，或直接回复“订阅 关键词”，如“订阅 教学设备”，您将随时随地接收招标信息！\n\n剑鱼标讯，让投标无限可能！",
     "tpl_subscribe_push_id": "IY_RWWzMlwDK6hcd6RAzTec6qre8n5r8PNOOUM_hgk0",
@@ -92,10 +92,6 @@
         }
     ],
 	"policysupport":"<a href='https://www.jianyu360.com/jyfcfg/main.html'>点击此处</a>，立即查看最新的企业扶持政策。",
-<<<<<<< HEAD
-	"policyKeys":"政策"
-}
-=======
 	"policyKeys":"政策",
 	"datareportUserReply":{
 		"title":"剑鱼标讯数据报告",
@@ -104,4 +100,3 @@
 		"desc":"剑鱼标讯官方制作的高质量行业数据报告"
 	}
 }
->>>>>>> release

src/web/staticres/vipsubscribe/css/vip_purchase.css

@@ -741,7 +741,7 @@
 }
 
 .vip_purchase .time_cycle .box_bd .bd_select {
-    padding: .62rem .4rem .64rem;
+    padding: .54rem .4rem .64rem;
 }
 
 .vip_purchase .time_cycle .box_bd .bd_select .choose-form {