wangkaiyue 6 years ago
parent
commit
68ad1d62b1

+ 4 - 14
src/jfw/modules/app/src/web/templates/datareport/dataReport_info.html

@@ -11,19 +11,9 @@
         <link rel="stylesheet" type="text/css" href="/jyapp/datareport/css/base.css?v={{Msg "seo" "version"}}" />
         <link rel="stylesheet" type="text/css" href="/jyapp/datareport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
         <link rel="stylesheet" href="/jyapp/datareport/css/dataReport_info.css?v={{Msg "seo" "version"}}">
-        <script src="{{Msg "seo" "cdn"}}/jyapp/js/rem.js"></script>
-    		<link href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-    		<link href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
     </head>
     <body>
-        <div class="loading_" style="display:none;">
-      		<p><span></span></p>
-      	</div>
-      	<div class="app-layout-header">
-      		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-      		支付订单
-      	</div>
-        <div id="pay_order" style="margin-top: 65px;">
+        <div id="pay_order">
             <main class="main">
                 <p class="top_tip">请填写您的个人信息</p>
                 <div class="form">
@@ -230,8 +220,8 @@
                         }
                       }else{
                         showToast(r.showErr)
+                        canpay=true
                       }
-                      canpay=true
                   })
               })
               //查询是否支付完成
@@ -241,9 +231,9 @@
                   clearInterval(interval);
                 }
                 interval=setInterval(function() {
-                  $.post("/jyapp/dataReport/isPaySuccess",{report_id:orderid},function(r){
+                  $.post("/jyapp/dataReport/isPaySuccess",{payOrderId:orderid},function(r){
                     if(r.success){
-                      window.location.href = "/jyapp/dataReport/paySuccess?email="+s_email;
+                      location.replace("/jyapp/dataReport/paySuccess?email="+s_email); 
                     }
                   })
                   if(canpay){

+ 1 - 11
src/jfw/modules/app/src/web/templates/datareport/dataReport_success.html

@@ -10,18 +10,8 @@
         <link rel="stylesheet" type="text/css" href="/jyapp/datareport/css/base.css?v={{Msg "seo" "version"}}"/>
         <link rel="stylesheet" href="/jyapp/datareport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
         <link rel="stylesheet" href="/jyapp/datareport/css/dataReport_success.css?v={{Msg "seo" "version"}}">
-        <script src="{{Msg "seo" "cdn"}}/jyapp/js/rem.js"></script>
-    		<link href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-    		<link href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
     </head>
     <body>
-        <div class="loading_" style="display:none;">
-      		<p><span></span></p>
-      	</div>
-      	<div class="app-layout-header">
-      		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-      		支付订单
-      	</div>
         <div class="submit_success"  style="margin-top: 65px;">
             <div class="success">
                 <i class="icon iconfont">&#xe612;</i>
@@ -29,7 +19,7 @@
                 <div class="success_hint">我们会尽快将数据报告发送至</div>
                 <div class="success_hint">{{.T.email}}</div>
             </div>
-            <a href="#" class="go_back">我知道了</a>
+            <a onclick="window.history.go(-1)" class="go_back" id="ddd">我知道了</a>
         </div>
     </body>
 </html>

+ 1 - 1
src/jfw/public/dataexport.go

@@ -700,7 +700,7 @@ func SendDatareportMailToPayUser(report_id int, user_mail string, auth []*mail.G
 func GetBrforeMsg(userId, openId string) (name, phone, company, email string) {
 	order := Mysql.FindOne("jy_datareport_order", map[string]interface{}{
 		"user_id": userId,
-	}, "user_name,user_mail,user_phone,user_company", "")
+	}, "user_name,user_mail,user_phone,user_company", "create_time desc")
 	if order != nil {
 		name = util.ObjToString((*order)["user_name"])
 		phone = util.ObjToString((*order)["user_phone"])