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

src/config.json

@@ -32,7 +32,7 @@
         }
     },
     "agreement": "http",
-    "webdomain": "http://web-jydev-zxl.jianyu360.cn",
+    "webdomain": "http://web-jydev-wky.jianyu360.cn",
     "redirect": {
         "searchinfo": "/jylab/mainSearch",
         "rssset": "/swordfish/historypush",

src/jfw/modules/subscribepay/src/config.json

@@ -35,7 +35,7 @@
         }
     },
 	"appPushServiceRpc": "127.0.0.1:5566",
-    "webdomain": "http://web-jydev-zxl.jianyu360.cn",
+    "webdomain": "http://web-jydev-wky.jianyu360.cn",
     "mail": [
         {
             "addr": "smtp.exmail.qq.com",

src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go

@@ -168,7 +168,17 @@ func (this *SubscribeChange) SaveChange() {
 			log.Println(userId+" 前台计算", req_price, "后台计算", final_price)
 			return &entity.FuncResult{false, errors.New("金额校验异常"), nil}
 		}
-
+		if entity.SubVipPrice.Discount < 1 {
+			tmp := float64(final_price) * entity.SubVipPrice.Discount
+			if tmp < 1 {
+				if tmp != 0 {
+					final_price = 1
+				}
+			} else {
+				final_price = int(tmp)
+			}
+			log.Printf("进行折扣计算 折扣后金额%d\n", final_price)
+		}
 		//return &entity.FuncResult{true, nil, map[string]interface{}{"price": final_price}}
 		//创建订单
 		filterStr, err := json.Marshal(filter)

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-ws.jianyu360.cn",
-    "appid": "wx5b1c6e7cc4dac0e4",
-    "apptoken": "top2015top2015",
-    "appsecret": "b026103ffebd2291b3edb7a269612112",
-    "proxysess": "http://web-jydev-ws.jianyu360.cn/front/sess/%s",
+    "webdomain": "http://web-jydev-wky.jianyu360.cn",
+	"appid": "wx79f2cc873dbea989",
+	"apptoken": "top2016top2016",
+	"appsecret": "fb3f77e9c6725811b5c39f6d58bd58a3",
+	"proxysess": "http://web-jydev-wky.jianyu360.cn/front/sess/%s",
     "followCompany": 10,
     "welcomemsg": "用剑鱼标讯，所有功能完全免费，\n和传统的会员制说再见！\n\n<a href='%s'>点击这里</a>设置关键词，或直接回复“订阅 关键词”，如“订阅 教学设备”，您将随时随地接收招标信息！\n\n剑鱼标讯，让投标无限可能！",
     "tpl_subscribe_push_id": "IY_RWWzMlwDK6hcd6RAzTec6qre8n5r8PNOOUM_hgk0",

src/web/staticres/css/wxlist.css

@@ -33,7 +33,7 @@
 	font-size:16px;
 	width:25px;
 	position: absolute;
-	top: 1px;
+	top: 0px;
 }
 .restime{
 	float:right;