Commit 4b42ccae710af1afe105b7f4f8f5ba6d0beab8bf
Merge branch 'master' of https://git.oschina.net/zte-its/rnt-wx.git
Showing
2 changed files
with
22 additions
and
18 deletions
src/main/webapp/WEB-INF/pages/check.html
@@ -204,6 +204,8 @@ | @@ -204,6 +204,8 @@ | ||
204 | if (res.err_msg == "get_brand_wcpay_request:ok") { | 204 | if (res.err_msg == "get_brand_wcpay_request:ok") { |
205 | //$.alert("亲!支付成功!"); | 205 | //$.alert("亲!支付成功!"); |
206 | //支付成功 | 206 | //支付成功 |
207 | + | ||
208 | + passHandrail(); | ||
207 | window.location.href = mUrl.paySuccessView + '&payMoney=' + totleMoney; | 209 | window.location.href = mUrl.paySuccessView + '&payMoney=' + totleMoney; |
208 | 210 | ||
209 | } else { | 211 | } else { |
@@ -230,6 +232,26 @@ | @@ -230,6 +232,26 @@ | ||
230 | jsApiCall(payParam); | 232 | jsApiCall(payParam); |
231 | } | 233 | } |
232 | } | 234 | } |
235 | + | ||
236 | + | ||
237 | + //支付成功后,调用此函数通知抬杆 | ||
238 | + function passHandrail() { | ||
239 | + var orderId = $('#parkOrderId').val(); | ||
240 | + var req = { | ||
241 | + orderId: orderId | ||
242 | + } | ||
243 | + | ||
244 | + $.ajax({ | ||
245 | + url: mUrl.passHandrail, | ||
246 | + type: 'post', | ||
247 | + dataType: 'json', | ||
248 | + data: req, | ||
249 | + success: function (res) { | ||
250 | + console.log(res); | ||
251 | + } | ||
252 | + }) | ||
253 | + | ||
254 | + } | ||
233 | </script> | 255 | </script> |
234 | </body> | 256 | </body> |
235 | </html> | 257 | </html> |
src/main/webapp/WEB-INF/pages/pay.html
@@ -224,7 +224,6 @@ | @@ -224,7 +224,6 @@ | ||
224 | //$.alert("亲!支付成功!"); | 224 | //$.alert("亲!支付成功!"); |
225 | //支付成功 | 225 | //支付成功 |
226 | //调用后台,通知抬杆放行 | 226 | //调用后台,通知抬杆放行 |
227 | - passHandrail(); | ||
228 | window.location.href = mUrl.paySuccessView + '&payMoney=' + totleMoney; | 227 | window.location.href = mUrl.paySuccessView + '&payMoney=' + totleMoney; |
229 | 228 | ||
230 | } else { | 229 | } else { |
@@ -242,24 +241,7 @@ | @@ -242,24 +241,7 @@ | ||
242 | ); | 241 | ); |
243 | } | 242 | } |
244 | 243 | ||
245 | - //支付成功后,调用此函数通知抬杆 | ||
246 | - function passHandrail() { | ||
247 | - var orderId = $('#parkOrderId').val(); | ||
248 | - var req = { | ||
249 | - orderId: orderId | ||
250 | - } | ||
251 | - | ||
252 | - $.ajax({ | ||
253 | - url: mUrl.passHandrail, | ||
254 | - type: 'post', | ||
255 | - dataType: 'json', | ||
256 | - data: req, | ||
257 | - success: function (res) { | ||
258 | - console.log(res); | ||
259 | - } | ||
260 | - }) | ||
261 | 244 | ||
262 | - } | ||
263 | 245 | ||
264 | 246 | ||
265 | function callpay(payParam) { | 247 | function callpay(payParam) { |