Merge branch 'zct-v2-dengluyang' of https://code.hoteas.com/golang/hotime into zhoupengwei

example/app/search_record.go

@@ -15,9 +15,9 @@ var SearchRecordCtr = Ctr{
 			page = 1
 		}
 
-		if pageSize <= 0 {
-			pageSize = 20
-		}
+		//if pageSize <= 0 {
+		pageSize = 50
+		//}
 
 		data := Map{"del_flag": 0}
 		keywords := that.Req.FormValue("keywords")

example/app/vip_order.go

@@ -80,7 +80,7 @@ var VipOrderCtr = Ctr{
 		if user.GetCeilInt("salesman_id") != 0 {
 			data["salesman_id"] = user.GetCeilInt("salesman_id")
 		}
-		data["name"] = tp + "1年VIP会员"
+		data["name"] = companyName + tp + "1年VIP会员"
 
 		jsParams, e := wechat.WxPay.GetJsOrder(data.GetCeilInt64("amount"), that.Config.GetString("wechatAppID"), wc.GetString("openid"), data.GetString("name"), data.GetString("sn"), that.Config.GetString("wechatAppNotifyUrl"))
 		if e != nil {