Merge remote-tracking branch 'origin/dev' into dev

donate-service/src/main/webapp/resources/js/mobile/controllers/MobileProjectDetailCtrl.js

@@ -115,7 +115,25 @@ define([ 'app/app' ], function(app) {
          * 刷新页面 回到无订单号参数页
          */
         $scope.payAgain = function () {
-            window.location.href = "/mobile#/project/detail/" + id + "/" + imId;
+            $.ajax({
+                type : "POST",
+                url : "/wxpay/queryProjectRecodeState",
+                dataType : "json",
+                data: {
+                    outTradeNo : $scope.outTradeNo
+                },
+                success : function(res){
+                    if ("SUCCESS" == res) {
+                        window.location.href = "/project#/donationsOver/" + $scope.outTradeNo;
+                    } else {
+                        window.location.href = "/mobile#/project/detail/" + id + "/" + imId;
+                    }
+                },
+                error : function () {
+                    console.log("查询支付状态请求失败");
+                    window.location.href = "/mobile#/project/detail/" + id + "/" + imId;
+                }
+            });
         }
 
         /**
@@ -131,7 +149,7 @@ define([ 'app/app' ], function(app) {
                 },
                 success : function(res){
                     if ("SUCCESS" == res) {
-                        window.location.href = "/project#/donationsOver/" + outTradeNo;
+                        window.location.href = "/project#/donationsOver/" + $scope.outTradeNo;
                     } else if ("WAITING" == res) {
                         //TODO 新弹框 继续支付  取消支付
                         console.log("微信订单待支付");

donate-service/src/main/webapp/resources/js/pay.js

@@ -105,7 +105,7 @@ var wxPay = function (proId, amount, payWay, imid) {
                         return;
                     }
                     document.cookie = 'qrcodeUrl='+encodeURIComponent(resJsonObj.qrcodeUrl);
-                    window.location.href = "http://lj.ubtob.com/project#/donateQrcode/" + resJsonObj.outTradeNo;
+                    window.location.href = "/project#/donateQrcode/" + resJsonObj.outTradeNo;
                 }
             },
             error : function() {