Merge remote-tracking branch 'remotes/origin/developer' into developerB

src/main/resources/static/js/pay/caimei-paycash.js

@@ -196,7 +196,6 @@ var payContainer = new Vue({
                                     orderID:_self.payInfo.PAY_ORDERID,
                                     payAmount:_self.payAmount
                             };
-                            console.log(orderInfo)
                             _self.payInfo.PAY_MOBILE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxea43a0f9ebce9e66&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
                             location.href = _self.payInfo.PAY_MOBILE_URL;
                         }else{
@@ -207,7 +206,7 @@ var payContainer = new Vue({
                                 url:_self.payInfo.PAY_MOBILE_URL
                             };
                             CAIMEI.Storage.setItem('PAY_DATA',JSON.stringify(_self.payInfo.PAY_DATA));
-                            window.open("/pay/caimei-paymobile.html?pageType=1");
+                            window.open("/pay/caimei-paymobile.html?pageType=0");
                             _self.isPayAlert = true;
                         }
                     }

src/main/resources/static/js/pay/caimei-paymobile.js

@@ -108,17 +108,18 @@ var payContainer = new Vue({
         },
         getWrchatQrcodeShow:function(){//生成微信二维码
             var _self = this;
+            var orderInfo = {};
             if( _self.pageType === '1'){
-                var orderInfo = {//二手微信二维码参数
-                        pageType:1,
-                        productId:_self.productID,
-                        payAmount:_self.payAmount
+                orderInfo = {//二手微信二维码参数
+                    pageType:1,
+                    productId:_self.productID,
+                    payAmount:_self.payAmount
                 };
             }else{
-                var orderInfo = {//普通订单微信二维码参数
-                        pageType:0,
-                        orderID:_self.payInfo.PAY_ORDERID,
-                        payAmount:_self.payAmount
+                orderInfo = {//普通订单微信二维码参数
+                    pageType:0,
+                    orderID:_self.payInfo.PAY_ORDERID,
+                    payAmount:_self.payAmount
                 };
             }
             _self.payInfo.PAY_MOBILE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxea43a0f9ebce9e66&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
@@ -191,13 +192,16 @@ var payContainer = new Vue({
         var payData = JSON.parse(CAIMEI.Storage.getItem('PAY_DATA'));
         _self.pageType = CAIMEI.getUrlParam('pageType');
         console.log(payData);
+        console.log(_self.pageType);
         if( _self.pageType === '1'){
+            console.log('二手商品');
             _self.payInfo.PAY_TYPE = payData.type;
             _self.productID = payData.productId;
             _self.payInfo.PAY_MOBILE_URL = payData.url;
             _self.mbOrderId = payData.mbOrderId;
             _self.payAmount = _self.payableAmount = payData.amount;
         }else{
+            console.log('订单支付');
             _self.payInfo.PAY_TYPE = payData.type;
             _self.payInfo.PAY_ORDERID = payData.orderid;
             _self.payInfo.PAY_UNPAIDAMOUNT = payData.amount;

src/main/resources/static/js/pay/caimei-wechatpay.js

@@ -38,6 +38,7 @@ var payContainer = new Vue({
             }
         },
         WxRequestsecondHandPay:function(){
+            var _this = this;
             var params = {
                 payWay:'WEIXIN',
                 code:_this.wechatcode,