%!s(int64=6) %!d(string=hai) anos · 284eb50c3b
--- a/src/config.json
+++ b/src/config.json
@@ -212,6 +212,10 @@
 
				 			"sjdc_bodymsg": "剑鱼标讯-历史数据",
			
 
				 			"sjdc_detailmsg": "剑鱼标讯-历史数据",
			
 
				 			"sjbd_msg":"剑鱼标讯-数据报告"
			
 
				+		},
			
 
				+		"openidSwitch":{
			
 
				+			"oIMvJvrVXG89597EFmYiSiznbyyY":"oHwE_wEQlEBvjZJOyZeNnQcgKQMo",
			
 
				+			"ouCYjw4BJMbpdMRYrTTLb9nFi2RE":"oHwE_wNA1V0DURDO0h7wAriz0qIY"
			
 
				 		}
			
 
				 	},
			
 
				 	"aliPay": {
			
--- a/src/jfw/front/datareport.go
+++ b/src/jfw/front/datareport.go
@@ -33,7 +33,7 @@ func (d *DataReport) ToDataReport() error {
 
				 	openId := util.ObjToString(d.GetSession("s_m_openid"))
			
 
				 	datareport := public.Mysql.FindOne("jy_datareport", map[string]interface{}{
			
 
				 		"report_id": reportId,
			
 
				-	}, "i_price", "")
			
 
				+	}, "i_price,report_name", "")
			
 
				 	if datareport == nil {
			
 
				 		return errors.New("未找到此数据")
			
 
				 	}
			
@@ -46,6 +46,7 @@ func (d *DataReport) ToDataReport() error {
 
				 	d.T["email"] = email
			
 
				 	d.T["reportId"] = reportId
			
 
				 	d.T["money"] = util.Float64All((*datareport)["i_price"]) / 100
			
 
				+	d.T["title"] = (*datareport)["report_name"]
			
 
				 	d.Render("/weixin/datareport/dataReport_info.html", &d.T)
			
 
				 	return nil
			
 
				 }
			
--- a/src/jfw/modules/app/src/app/front/datareport.go
+++ b/src/jfw/modules/app/src/app/front/datareport.go
@@ -34,7 +34,7 @@ func (d *DataReport) ToDataReport(reportId string) error {
 
				 	openId := util.ObjToString(d.GetSession("a_m_openid"))
			
 
				 	datareport := public.Mysql.FindOne("jy_datareport", map[string]interface{}{
			
 
				 		"report_id": reportId,
			
 
				-	}, "i_price", "")
			
 
				+	}, "i_price,report_name", "")
			
 
				 	if datareport == nil {
			
 
				 		return errors.New("未找到此数据")
			
 
				 	}
			
@@ -47,6 +47,7 @@ func (d *DataReport) ToDataReport(reportId string) error {
 
				 	d.T["email"] = email
			
 
				 	d.T["reportId"] = reportId
			
 
				 	d.T["money"] = util.Float64All((*datareport)["i_price"]) / 100
			
 
				+	d.T["title"] = (*datareport)["report_name"]
			
 
				 	d.Render("/datareport/dataReport_info.html", &d.T)
			
 
				 	return nil
			
 
				 }
			
--- a/src/jfw/modules/app/src/web/staticres/jyapp/datareport/css/dataReport_info.css
+++ b/src/jfw/modules/app/src/web/staticres/jyapp/datareport/css/dataReport_info.css
@@ -73,6 +73,7 @@
 
				   font-size: .3rem;
			
 
				 }
			
 
				 #pay_order .main .form .form-item .form-control .way-right {
			
 
				+  color: #7f7f7f;
			
 
				   display: -webkit-box;
			
 
				   display: -ms-flexbox;
			
 
				   display: flex;
			
--- a/src/jfw/modules/app/src/web/templates/datareport/dataReport_info.html
+++ b/src/jfw/modules/app/src/web/templates/datareport/dataReport_info.html
@@ -2,7 +2,7 @@
 
				 <html>
			
 
				     <head>
			
 
				         <meta charset="utf-8">
			
 
				-        <title>支付订单</title>
			
 
				+        <title>{{.T.title}}</title>
			
 
				         <meta name="viewport" content="initial-scale=1, maximum-scale=1">
			
 
				         <meta name="apple-mobile-web-app-capable" content="yes">
			
 
				         <meta name="apple-mobile-web-app-status-bar-style" content="black">
			
@@ -158,8 +158,15 @@
 
				                         $toast.fadeOut(300);
			
 
				                     }, 1500);
			
 
				                 }
			
 
				-
			
 
				+                
			
 
				                 // 手机和邮箱格式错误提醒
			
 
				+                $('.form-control.email input').on('blur', function () {
			
 
				+                    if (!reg_email.test(s_email)) {
			
 
				+                        showToast('邮箱格式不正确')
			
 
				+                    }
			
 
				+                })
			
 
				+                
			
 
				+                
			
 
				                 $('.form-control.tel input').on('blur', function () {
			
 
				                     if (!reg_tel.test(s_phone)) {
			
 
				                         showToast()
			
--- a/src/jfw/pay/weixin.go
+++ b/src/jfw/pay/weixin.go
@@ -46,6 +46,7 @@ func init() {
 
				 		Sjdc_bodymsg:      util.ObjToString(payConfig["sjdc_bodymsg"]),
			
 
				 		Sjdc_detailmsg:    util.ObjToString(payConfig["sjdc_detailmsg"]),
			
 
				 		Sjbg_msg:          util.ObjToString(payConfig["sjbd_msg"]),
			
 
				+		OpenidSwitch:      util.ObjToMap(config.WeixinConfig["openidSwitch"]),
			
 
				 	}
			
 
				 }
			
 
				 
			
--- a/src/jfw/public/dataexport.go
+++ b/src/jfw/public/dataexport.go
@@ -71,6 +71,7 @@ type WeixinStruct struct {
 
				 	Sjdc_bodymsg      string
			
 
				 	Sjdc_detailmsg    string
			
 
				 	Sjbg_msg          string
			
 
				+	OpenidSwitch      *map[string]interface{}
			
 
				 }
			
 
				 
			
 
				 func (w *WeixinStruct) GetTradeno(tp string) string {
			
@@ -103,10 +104,11 @@ func (w *WeixinStruct) CreatePrepayOrder(weixinrpc, tradeno, ip, openid, detailm
 
				 		}
			
 
				 	}
			
 
				 	tradeno = w.GetTradeno(tradeno)
			
 
				-	if openid == "oRvqm1GPauaYHbCoBmOFsaxTs9X4" || openid == "oIMvJvrVXG89597EFmYiSiznbyyY" { //测试支付使用
			
 
				-		openid = "oHwE_wEQlEBvjZJOyZeNnQcgKQMo"
			
 
				-	} else if openid == "oIMvJvhl7CntkeLe3jEukHWhuKRc" {
			
 
				-		openid = "oHwE_wPk1VERbfcK2GRYtFWaStpk"
			
 
				+	//测试环境微信支付需要转换对应的正式环境的openid
			
 
				+	if w.OpenidSwitch != nil {
			
 
				+		if oid, ok := (*(w.OpenidSwitch))[openid]; ok {
			
 
				+			openid = oid.(string)
			
 
				+		}
			
 
				 	}
			
 
				 	log.Println(w.Appid, "---", openid)
			
 
				 	//获取预订单号
			
--- a/src/web/templates/weixin/datareport/dataReport_info.html
+++ b/src/web/templates/weixin/datareport/dataReport_info.html
@@ -2,7 +2,7 @@
 
				 <html>
			
 
				     <head>
			
 
				         <meta charset="utf-8">
			
 
				-        <title>支付订单</title>
			
 
				+        <title>{{.T.title}}</title>
			
 
				         <meta name="viewport" content="initial-scale=1, maximum-scale=1">
			
 
				         <meta name="apple-mobile-web-app-capable" content="yes">
			
 
				         <meta name="apple-mobile-web-app-status-bar-style" content="black">
			
@@ -145,6 +145,12 @@
 
				                         showToast()
			
 
				                     }
			
 
				                 })
			
 
				+                $('.form-control.email input').on('blur', function () {
			
 
				+                    if (!reg_email.test(s_email)) {
			
 
				+                        showToast('邮箱格式不正确')
			
 
				+                    }
			
 
				+                })
			
 
				+                
			
 
				                 $('.form-control.name input').on('blur', function () {
			
 
				                     if (!s_name) {
			
 
				                         showToast('姓名不能为空')