采美线上支付更换

src/main/resources/config/dev/application-dev.yml

@@ -54,8 +54,8 @@ logging:
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
   spiServer: http://192.168.2.68:8008
-  coreServer: https://core-b.caimei365.com
-#  coreServer: http://192.168.2.68:18002
+#  coreServer: https://core-b.caimei365.com
+  coreServer: http://192.168.2.67:18002
 #  coreServer: http://192.168.2.75:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009

src/main/resources/static/css/account/login.css

@@ -36,7 +36,7 @@ li{list-style:none}
  .fix-tips {background: -webkit-gradient(linear,left top,right top,color-stop(0,#4d4d4d),color-stop(.4,#4d4d4d),color-stop(.5,#fff),color-stop(.6,#4d4d4d),color-stop(1,#4d4d4d));-webkit-background-clip: text;-webkit-text-fill-color: transparent;-webkit-animation: slidetounlock 3s infinite;color: #787878 !important;}
  @keyframes slidetounlock { 0% {background-position: -100px 0;} 100% {background-position: 100px 0;} }
  #qrCodeWrap{position:relative}
- #qrCodeWrap .model{position:absolute;width:200px;height:200px;top:15px;left:98px;display:flex;justify-content:center;align-items:center;background:rgba(255,255,255,1);color:#000;z-index:99999;cursor:pointer;border:1px solid #EBEBEB}
+ #qrCodeWrap .model{position:absolute;width:200px;height:200px;top:15px;left:76px;display:flex;justify-content:center;align-items:center;background:rgba(255,255,255,1);color:#000;z-index:99999;cursor:pointer;border:1px solid #EBEBEB}
  #qrCodeWrap .model .refresh{width:21px;height:21px;display:block;margin:0 auto 3px}
  #qrCodeWrap .model .refresh-div{width:100px;height:64px;display:block}
  #qrCodeWrap .model .refresh-div p{text-align:center;font-size:14px;line-height:20px}

src/main/resources/static/js/common/serviceapi/pay.service.js

@@ -42,7 +42,7 @@ var PayApi = {
         },
         PayOrderPcMallAlipay: function (params, callback) {// 正常订单支付宝支付
             Http.AjaxService({
-                url:'/order/pay/alipay',
+                url:'/order/pay/scan/pay',
                 type:'POST',
                 data:params,
                 json:false,
@@ -54,7 +54,7 @@ var PayApi = {
         },
         PayOrderMiniWxPay: function (params, callback) {// 调起微信公众号支付
             Http.AjaxService({
-                url:'/order/pay/wechat',
+                url:'/order/pay/online',
                 type:'post',
                 data:params,
                 json:false,
@@ -114,7 +114,7 @@ var PayApi = {
         },
         PayOrdersecondAliPay: function (params, callback) {//二手发布支付 支付宝支付
             Http.AjaxService({
-                url:'/order/pay/second/alipay',
+                url:'/order/pay/second/scan',
                 type:'POST',
                 data:params,
                 json:false,
@@ -167,7 +167,7 @@ var PayApi = {
 
         PayVipAliPay: function(params, callback){ // vip支付宝支付
             Http.AjaxService({
-                url:'/order/pay/vip/alipay',
+                url:'/order/pay/vip/scan',
                 type:'POST',
                 data:params,
                 json:false,
@@ -188,5 +188,17 @@ var PayApi = {
             .then(function(res){
                 callback(res);
             });
+        },
+        PayGetBankCode: function(params, callback){ // 网银银行列表
+            Http.AjaxService({
+                url:'/order/pay/bankcode',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         }
 };

src/main/resources/static/js/flea-market/form.js

@@ -18,7 +18,7 @@ var fleaMarketForm = new Vue({
         BrandList:[],
         isShow:false,
         includedTax:'',
-        GoodsImagesList:[],
+        GoodsImagesList:['https://img0.baidu.com/it/u=1213827208,2559395113&fm=26&fmt=auto'],
         oldNum:0,
         secondType:0,
         vShow_GoodsImages:false,
@@ -44,7 +44,7 @@ var fleaMarketForm = new Vue({
             secondProductType:'',//
             townId:'',//县区地址
             address:'',//详细地址
-            image:'',//图片
+            image:'https://img0.baidu.com/it/u=1213827208,2559395113&fm=26&fmt=auto',//图片
             productDetails:'',//商品详细信息
             source:1,
             dockingPeopleMobile:'',

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

@@ -6,7 +6,7 @@ var payContainer = new Vue({
     data: {
         isSubMitStatus:false,
         payInfo:{
-            payBankNum:'ICBC_B2B',//银行网管信息
+            payBankNum:'ICBC',//银行网管信息
             payCode:'',//链接状态
             payOrderId:'',//主订单ID
             payUnpaidAmount:0,//本次支付金额
@@ -16,8 +16,7 @@ var payContainer = new Vue({
             payUserType:'',//网银支付类型
             payLinkTypeText:'',//文案
         },
-        B2BbankData:bank.b2BbankData,// 企业网银
-        B2CbankData:bank.b2CbankData,// 个人网银
+        bankListData:[],// 银行列表
         userName :'',
         goodList:'',
         freight :'',       //运费
@@ -50,7 +49,8 @@ var payContainer = new Vue({
         comboInfo: [], // 会员套餐
         type: 1,
         vipMonth: 0,
-        vipRecordId: undefined
+        vipRecordId: undefined,
+        iframe:''
     },
     filters: {
         NumFormat :function(value) {
@@ -83,7 +83,7 @@ var payContainer = new Vue({
                     _self.payInfo.payTime = decodeURI(_data.time);
                     _self.payInfo.payLinkType = _data.orderPayLink.payType;
                     _self.payInfo.payLinkTypeText =  _self.payInfo.payLinkType == 1 ? '企业网银' : '个人网银';
-                    _self.payInfo.payUserType =  _self.payInfo.payLinkType == 1 ? 'ENTERPRISE' : 'USER';
+                    _self.payInfo.payUserType =  _self.payInfo.payLinkType == 1 ? 'B2B' : 'B2C';
                     _self.unpaidAmount = _data.orderPayLink.unpaidAmount;
                     _self.type = _data.type;
                     if(_data.code == 0){
@@ -161,6 +161,16 @@ var payContainer = new Vue({
                 }
             })
         },
+        getBankList:function () {
+            var _self = this;
+            PayApi.PayGetBankCode({},function(response){
+                if(response.code == 0){
+                    _self.bankListData = response.data.list;
+                }else{
+                    console.log('获取网银支付银行列表异常')
+                }
+            })
+        },
         PaySubmitFn:function(){//立即支付
             var _self = this;
             if(_self.payInfo.payBankNum == ''){
@@ -170,52 +180,59 @@ var payContainer = new Vue({
             if (_self.type === 2){
                 // 支付超级会员
                 console.log('支付超级会员');
-                var params = {
-                    bankCode: this.payInfo.payBankNum,
-                    returnUrl: 'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
-                    userType: _self.payInfo.payUserType,
-                    vipRecordId: _self.vipRecordId,
-                };
-                _self.PayVipPcMallPay(params);
+                _self.PayVipPcMallPay();
             }else {
                 // 普通订单
                 console.log('支付普通订单');
-                var params = {
-                    payWay: 'UNIONPAY',
-                    payAmount: _self.payInfo.payUnpaidAmount * 100,
-                    bankCode: _self.payInfo.payBankNum,
-                    returnUrl: 'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
-                    orderId: _self.payInfo.payOrderId,
-                    userType: _self.payInfo.payUserType
-                };
-                _self.PayOrderPcMallPay(params);
+                _self.PayOrderPcMallPay();
             }
         },
         // 网银支付超级会员
         PayVipPcMallPay: function(params){
             var _self = this;
             _self.isSubMitStatus=true;
+            var params = {
+                payType:'YL',
+                bankCode: this.payInfo.payBankNum,
+                returnUrl: 'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
+                userType: _self.payInfo.payUserType,
+                vipRecordId: _self.vipRecordId,
+            };
             PayApi.PayVipPcMallPay(params, function(response){
                 if (response.code == 0) {
-                    _self.isPayAlert = true;
-                    _self.mbOrderId = response.data.data.mbOrderId;
-                    window.open(response.data.data.payUrl);
-                    _self.isSubMitStatus = false;
+                    // _self.isPayAlert = true;
+                    _self.iframe = response.data;
+                    setTimeout(function () {
+                        var onlineForm = document.getElementById('onlineForm');
+                        _self.isSubMitStatus=false;
+                        onlineForm.submit();
+                    },2000)
                 } else {
                     CAIMEI.Alert(response.msg, '确定', false);
                     _self.isSubMitStatus = false;
                 }
             });
         },
-        PayOrderPcMallPay:function(params){//订单网银支付请求
+        PayOrderPcMallPay:function(){//订单网银支付请求
             var _self = this;
             _self.isSubMitStatus=true;
+            var params = {
+                payType:'YL',
+                payAmount: _self.payInfo.payUnpaidAmount,
+                bankCode: _self.payInfo.payBankNum,
+                returnUrl: 'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
+                orderId: _self.payInfo.payOrderId,
+                userType: _self.payInfo.payUserType
+            };
             PayApi.PayOrderPcMallPay(params,function(response){
                 if(response.code == 0){
-                    _self.isPayAlert = true;
-                    _self.mbOrderId = response.data.data.mbOrderId;
-                    window.open(response.data.data.payUrl);
-                    _self.isSubMitStatus=false;
+                    // _self.isPayAlert = true;
+                    _self.iframe = response.data;
+                    setTimeout(function () {
+                        var onlineForm = document.getElementById('onlineForm');
+                        _self.isSubMitStatus=false;
+                        onlineForm.submit();
+                    },2000)
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                     _self.isSubMitStatus=false;
@@ -236,9 +253,9 @@ var payContainer = new Vue({
         changeTab:function(index,item){// 选择银行
             this.tabIndex = index;
             if( this.payInfo.payLinkType == 1){
-                this.payInfo.payBankNum = item.B2bNum;
+                this.payInfo.payBankNum = item.b2B;
             }else{
-                this.payInfo.payBankNum = item.B2cNum;
+                this.payInfo.payBankNum = item.b2C;
             }
         },
         slideToggleContent:function(){
@@ -307,7 +324,7 @@ var payContainer = new Vue({
     mounted: function () {
         var _self = this;
         _self.payInfo.payLinkLogo= CAIMEI.getUrlParam('linkLogo');
+        _self.getBankList();
         _self.LinkInfoOrderBank(_self.payInfo.payLinkLogo);
-
     }
 });

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

@@ -12,17 +12,16 @@ var payContainer = new Vue({
             payAmount: 0,//本次支付金额
             payMobileUrl: '',//二维码生成链接
             payData:{},       //支付数据
-            payUserType:'ENTERPRISE',
+            payUserType:'B2B',
             payType:'',
         },
-        B2BbankData:bank.b2BbankData,
-        B2CbankData:bank.b2CbankData,
+        bankListData:[],
         methodTab:['线上支付','转账支付'],
         mobileData:[
             {imgUrl:'/img/pay/iconbank-ali@2x.png',bankName:'支付宝支付',bankNum:'ALIPAY'},
             {imgUrl:'/img/pay/iconbank-wx@2x.png',bankName:'微信支付',bankNum:'WEIXIN'},
-            {imgUrl:'/img/pay/iconbank-B2Bbank@2x.png',bankName:'网银支付',bankNum:'ICBC_B2B'},
-            {imgUrl:'/img/pay/iconbank-B2Cbank@2x.png',bankName:'个人网银',bankNum:'ICBC_B2C'}
+            {imgUrl:'/img/pay/iconbank-B2Bbank@2x.png',bankName:'网银支付',bankNum:'ICBC'},
+            {imgUrl:'/img/pay/iconbank-B2Cbank@2x.png',bankName:'个人网银',bankNum:'ICBC'}
         ],
         pageType:'',//页面跳转类型 1 二手支付
         paidAmount:'',//订单待付金额
@@ -53,6 +52,7 @@ var payContainer = new Vue({
         is_Wechat_bowcr:false,
         comboInfo: null, //选中的svip套餐信息
         vipRecordId: undefined,
+        iframe:''
     },
     filters: {
         NumFormat:function(value) {
@@ -106,6 +106,16 @@ var payContainer = new Vue({
                 }
             })
         },
+        getBankList:function () {
+            var _self = this;
+            PayApi.PayGetBankCode({},function(response){
+                if(response.code == 0){
+                    _self.bankListData = response.data.list;
+                }else{
+                    console.log('获取网银支付银行列表异常')
+                }
+            })
+        },
         PayOrderOnLineSwitch:function(){//获取是否可以先上支付
             var _self = this;
             PayApi.PayOrderOnLineSwitch({},function(response){
@@ -162,85 +172,21 @@ var payContainer = new Vue({
                     CAIMEI.Alert(_self.paymentIimitText,'知道了');
                     return;
                 }
-                if(_self.payInfo.payBankNum == "WEIXIN"){
-                    if(_self.pageType === '1'){
-                        if(!isPC){
-                            var orderInfo = {//二手微信二维码参数
-                                    pageType:1,
-                                    productId:_self.productID,
-                                    payAmount:_self.payAmount
-                            };
-                            _self.payInfo.payMobileUrl = "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.payMobileUrl;
-                        }else{
-                            _self.payInfo.payData = {//二手
-                                type:_self.payInfo.payBankNum,
-                                productId:_self.productID,
-                                amount:_self.payAmount,
-                                url:_self.payInfo.payMobileUrl
-                            };
-                            CAIMEI.Storage.setItem('payData',JSON.stringify(_self.payInfo.payData));
-                            window.open("/pay/caimei-paymobile.html?pageType=1");
-                            _self.isPayAlert = true;
-                        }
-                    }else if(_self.pageType === '2'){ // 微信支付会员
+                if(_self.payInfo.payBankNum == "WEIXIN"){// 微信
+                    if(_self.pageType === '1'){ // 二手
+                        _self.PaySecondMiniWxPay();
+                    }else if(_self.pageType === '2'){ // 会员
                         _self.payVipMiniWxPay();
-                    }else{
-                        if(!isPC){
-                            var orderInfo = {//普通订单微信二维码参数
-                                    pageType:0,
-                                    orderID:_self.payInfo.payOrderId,
-                                    payAmount:_self.payAmount
-                            };
-                            _self.payInfo.payMobileUrl = "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.payMobileUrl;
-                        }else{
-                            _self.payInfo.payData = {//正常订单
-                                type:_self.payInfo.payBankNum,
-                                orderid:_self.payInfo.payOrderId,
-                                amount:_self.payAmount,
-                                url:_self.payInfo.payMobileUrl
-                            };
-                            CAIMEI.Storage.setItem('payData',JSON.stringify(_self.payInfo.payData));
-                            window.open("/pay/caimei-paymobile.html?pageType=0");
-                            _self.isPayAlert = true;
-                        }
+                    }else{ // 正常订单
+                        _self.PayOrderMiniWxPay();
                     }
-                }else if(_self.payInfo.payBankNum == "ALIPAY"){//支付宝支付
+                }else if(_self.payInfo.payBankNum == "ALIPAY"){// 支付宝
                     if(_self.pageType === '1'){// 二手
-                        var params = {//二手
-                                returnUrl:'https://www.caimei365.com/',
-                                productId:_self.productID,
-                            };
-                        _self.PayOrdersecondAliPay(params);
-                    }else if(_self.pageType === '2'){ // 支付宝支付会员
+                        _self.PayOrdersecondAliPay();
+                    }else if(_self.pageType === '2'){ // 会员
                         _self.payVipAliPay();
-                    }else{
-                        var params = {//正常订单
-                                payAmount:Math.round(_self.payAmount*100),
-                                returnUrl:'https://www.caimei365.com/',
-                                orderId:_self.payInfo.payOrderId
-                            };
-                        _self.PayOrderPcMallAlipay(params);
-                    }
-                }else{// 网银支付
-                    if(_self.pageType === '1'){
-                        var params = {//二手
-                            payWay:_self.payInfo.payBankNum,
-                            returnUrl:'https://www.caimei365.com/',
-                            productId:_self.productID,
-                        };
-                        _self.PayOrdersecondUnion(params,_self.payInfo.payBankNum);
-                    }else if(_self.pageType === '2'){ // 网银支付会员
-                        console.log('网银支付会员');
-                    }else{
-                        var params = {//正常订单
-                            payWay:_self.payInfo.payBankNum,
-                            payAmount:Math.round(_self.payAmount*100),
-                            returnUrl:'https://www.caimei365.com/',
-                            orderId:_self.payInfo.payOrderId
-                        };
-                        _self.PayOrderPcMallPay(params,_self.payInfo.payBankNum);
+                    }else{// 正常订单
+                        _self.PayOrderPcMallAlipay();
                     }
                 }
             }
@@ -259,55 +205,56 @@ var payContainer = new Vue({
                     return;
                 }
                 if(_self.payAmount <= 10){
-                    CAIMEI.dialog('企业网银支付的金额必须大于￥10.00');
+                    CAIMEI.dialog('本次支付金额小于网银手续费，不能进行网银支付。请使用微信/支付宝支付，或者线下转账。');
                     return;
                 }
-                if(_self.pageType === '1'){
-                    var params = {//二手
-                            bankCode:_self.payInfo.payBankNum,
-                            returnUrl:'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
-                            productId:_self.productID,
-                            userType:_self.payInfo.payUserType,
-                    };
-                    _self.PayOrdersecondUnion(params);
-                } else if (_self.pageType === '2') { // 网银付会员
+                if(_self.pageType === '1'){// 二手
+                    _self.PayOrdersecondUnion();
+                } else if (_self.pageType === '2') { // 会员
                     _self.payVipPcMallPay();
-                } else {
-                    var params = {//正常订单
-                            payAmount:Math.round(_self.payAmount*100),
-                            bankCode:_self.payInfo.payBankNum,
-                            returnUrl:'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
-                            orderId:_self.payInfo.payOrderId,
-                            userType:_self.payInfo.payUserType
-                    };
-                    _self.PayOrderPcMallPay(params,_self.payInfo.payBankNum);
+                } else {// 正常订单
+                    _self.PayOrderPcMallPay();
                 }
             }
         },
-        PayOrderPcMallPay:function(params){// 正常订单网银支付
+        PayOrderMiniWxPay:function (){// 正常订单微信支付通道
             var _self = this;
-            _self.isSubMitStatus=true;
-            PayApi.PayOrderPcMallPay(params,function(response){
-                if(response.code == 0){
-                    _self.isPayAlert = true;
-                    _self.isSubMitStatus=false;
-                    _self.mbOrderId = response.data.data.mbOrderId;
-                    window.open(response.data.data.payUrl);
-                }else{
-                    _self.isSubMitStatus=false;
-                    CAIMEI.Alert(response.msg,'确定',false);
-                }
-            })
+            if(!isPC){
+                var orderInfo = {//正常订单微信二维码参数
+                    pageType:0,
+                    orderID:_self.payInfo.payOrderId,
+                    payAmount:_self.payAmount
+                };
+                _self.payInfo.payMobileUrl = "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.payMobileUrl;
+            }else{
+                _self.payInfo.payData = {//正常订单
+                    type:_self.payInfo.payBankNum,
+                    orderid:_self.payInfo.payOrderId,
+                    amount:_self.payAmount,
+                    url:_self.payInfo.payMobileUrl
+                };
+                CAIMEI.Storage.setItem('payData',JSON.stringify(_self.payInfo.payData));
+                window.open("/pay/caimei-paymobile.html?pageType=0");
+                _self.isPayAlert = true;
+            }
         },
-        PayOrderPcMallAlipay:function (params){// 正常订单支付宝支付
+        PayOrderPcMallAlipay:function (){// 正常订单支付宝通道
             var _self = this;
+            var params = {//正常订单
+                payType:'ZFBEWM',
+                payAmount:_self.payAmount,
+                returnUrl:'https://www.caimei365.com/',
+                orderId:_self.payInfo.payOrderId
+            };
             _self.isSubMitStatus=true;
             PayApi.PayOrderPcMallAlipay(params,function(response){
                 if(response.code == 0){
+                    console.log('data',response.data)
                     _self.isPayAlert = true;
                     _self.isSubMitStatus=false;
-                    _self.mbOrderId = response.data.data.mbOrderId;
-                    _self.payInfo.payMobileUrl = response.data.data.payUrl;
+                    _self.mbOrderId = response.data.rt5_orderId;
+                    _self.payInfo.payMobileUrl = response.data.rt8_qrcode;
                     _self.payInfo.payData = {
                         mbOrderId:_self.mbOrderId,
                         type:_self.payInfo.payBankNum,
@@ -327,15 +274,68 @@ var payContainer = new Vue({
                 }
             })
         },
-        PayOrdersecondAliPay:function (params){// 二手支付宝支付
+        PayOrderPcMallPay:function(){// 正常订单网银支付通道
+            var _self = this;
+            var params = {//正常订单
+                payType:'YL',
+                payAmount:_self.payAmount,
+                bankCode:_self.payInfo.payBankNum,
+                returnUrl:'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
+                orderId:_self.payInfo.payOrderId,
+                userType:_self.payInfo.payUserType
+            };
+            _self.isSubMitStatus=true;
+            PayApi.PayOrderPcMallPay(params,function(response){
+                if(response.code == 0){
+                    // _self.isPayAlert = true;
+                    _self.iframe = response.data
+                    setTimeout(function () {
+                        var onlineForm = document.getElementById('onlineForm');
+                        _self.isSubMitStatus=false;
+                        onlineForm.submit();
+                    },2000)
+                }else{
+                    _self.isSubMitStatus=false;
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+            })
+        },
+        PaySecondMiniWxPay:function (){//二手发布微信支付通道
+            var _self = this;
+            if(!isPC){// h5跳 H5支付页
+                var orderInfo = {//二手微信二维码参数
+                    pageType:1,
+                    productId:_self.productID,
+                    payAmount:_self.payAmount
+                };
+                _self.payInfo.payMobileUrl = "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.payMobileUrl;
+            }else{// PC 跳扫码支付页
+                _self.payInfo.payData = {//二手
+                    type:_self.payInfo.payBankNum,
+                    productId:_self.productID,
+                    amount:_self.payAmount,
+                    url:_self.payInfo.payMobileUrl
+                };
+                CAIMEI.Storage.setItem('payData',JSON.stringify(_self.payInfo.payData));
+                window.open("/pay/caimei-paymobile.html?pageType=1");
+                _self.isPayAlert = true;
+            }
+        },
+        PayOrdersecondAliPay:function (){// 二手发布支付宝通道
             var _self = this;
+            var params = {//二手
+                payType:'ZFBEWM',
+                returnUrl:'https://www.caimei365.com/',
+                productId:_self.productID,
+            };
             _self.isSubMitStatus=true;
             PayApi.PayOrdersecondAliPay(params,function(response){
                 if(response.code == 0){
                     _self.isPayAlert = true;
                     _self.isSubMitStatus=false;
-                    _self.mbOrderId = response.data.data.mbOrderId;
-                    _self.payInfo.payMobileUrl = response.data.data.payUrl;
+                    _self.mbOrderId = response.data.rt5_orderId;
+                    _self.payInfo.payMobileUrl = response.data.rt8_qrcode;
                     _self.payInfo.payData = {
                         mbOrderId:_self.mbOrderId,
                         type:_self.payInfo.payBankNum,
@@ -351,21 +351,113 @@ var payContainer = new Vue({
                 }
             })
         },
-        PayOrdersecondUnion:function (params){// 二手网银支付
+        PayOrdersecondUnion:function (){// 二手发布网银支付通道
             var _self = this;
+            var params = {//二手
+                payType:'YL',
+                bankCode:_self.payInfo.payBankNum,
+                returnUrl:'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
+                productId:_self.productID,
+                userType:_self.payInfo.payUserType,
+            };
             _self.isSubMitStatus=true;
             PayApi.PayOrdersecondUnion(params,function(response){
                 if(response.code == 0){
-                    _self.isPayAlert = true;
-                    _self.isSubMitStatus=false;
-                    _self.mbOrderId = response.data.data.mbOrderId;
-                    window.open(response.data.data.payUrl);
+                    _self.iframe = response.data
+                    setTimeout(function () {
+                        var onlineForm = document.getElementById('onlineForm');
+                        _self.isSubMitStatus=false;
+                        onlineForm.submit();
+                    },2000)
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                     _self.isSubMitStatus=false;
                 }
             })
         },
+        payVipMiniWxPay: function(){ // 超级会员微信支付通道
+            var _self = this;
+            if (!isPC) {
+                var orderInfo = {//普通订单微信二维码参数
+                    pageType: 2,
+                    vipId: _self.comboInfo.id,
+                    vipRecordId: _self.vipRecordId,
+                    payAmount: _self.payAmount
+                };
+                _self.payInfo.payMobileUrl = "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.payMobileUrl;
+            } else {
+                _self.payInfo.payData = {
+                    type: _self.payInfo.payBankNum,
+                    vipId: _self.comboInfo.id,
+                    vipRecordId: _self.vipRecordId,
+                    amount: _self.payAmount,
+                    duration: _self.comboInfo.duration,
+                };
+                CAIMEI.Storage.setItem('payData', JSON.stringify(_self.payInfo.payData));
+                window.open("/pay/caimei-paymobile.html?pageType=2");
+                _self.isPayAlert = true;
+            }
+        },
+        payVipAliPay: function(){ // 超级会员支付宝通道
+            var _self = this;
+            var params = {
+                bankCode: _self.payInfo.payBankNum,
+                returnUrl: 'https://www.caimei365.com/',
+                userType: _self.payInfo.payUserType,
+                vipRecordId: _self.vipRecordId
+            };
+            _self.isSubMitStatus = true;
+            PayApi.PayVipAliPay(params, function(response){
+                console.log(response);
+                if (response.code === 0) {
+                    _self.isPayAlert = true;
+                    _self.isSubMitStatus = false;
+                    _self.mbOrderId = response.data.data.mbOrderId;
+                    _self.payInfo.payMobileUrl = response.data.data.payUrl;
+                    _self.payInfo.payData = {
+                        mbOrderId: _self.mbOrderId,
+                        type: _self.payInfo.payBankNum,
+                        amount: _self.payAmount,
+                        url: _self.payInfo.payMobileUrl,
+                    };
+                    CAIMEI.Storage.setItem('payData', JSON.stringify(_self.payInfo.payData));
+                    if (!isPC) {
+                        location.href = _self.payInfo.payMobileUrl;
+                    } else {
+                        window.open("/pay/caimei-paymobile.html?pageType=2&duration=" + _self.comboInfo.duration);
+                    }
+                } else {
+                    CAIMEI.Alert(response.msg, '确定', false);
+                    _self.isSubMitStatus = false;
+                }
+            });
+        },
+        payVipPcMallPay: function(){// 超级会员网银支付通道
+            console.log('网银支付会员');
+            var _self = this;
+            var params = {
+                payType:'YL',
+                bankCode: this.payInfo.payBankNum,
+                returnUrl: 'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
+                userType: _self.payInfo.payUserType,
+                vipRecordId: _self.vipRecordId
+            };
+            _self.isSubMitStatus=true;
+            PayApi.PayVipPcMallPay(params, function (response) {
+                if (response.code == 0) {
+                    _self.iframe = response.data
+                    setTimeout(function () {
+                        var onlineForm = document.getElementById('onlineForm');
+                        _self.isSubMitStatus=false;
+                        onlineForm.submit();
+                    },2000)
+                } else {
+                    _self.isSubMitStatus = false;
+                    CAIMEI.Alert(response.msg, '确定', false);
+                }
+            });
+        },
         changePayAmount:function(event){//输入支付金额控制
             var _self = this;
             var value = event.target.value;
@@ -407,20 +499,20 @@ var payContainer = new Vue({
             if( _self.mobileTabIndex==2){
                 _self.bankTabIndex = 0
                 _self.payInfo.payType = '1';
-                _self.payInfo.payUserType = 'ENTERPRISE';
+                _self.payInfo.payUserType = 'B2B';
             }else if(_self.mobileTabIndex == 3){
                 _self.bankTabIndex = 0
                 _self.payInfo.payType = '2';
-                _self.payInfo.payUserType = 'USER';
+                _self.payInfo.payUserType = 'B2C';
             }
         },
         checkBankPay:function(index,item){//选择网银支付方式-选择银行
             var _self = this;
             _self.bankTabIndex = index;
             if( _self.mobileTabIndex == 2 ){
-                _self.payInfo.payBankNum = item.B2bNum;
+                _self.payInfo.payBankNum = item.b2B;
             }else if( _self.mobileTabIndex ==3 ){
-                _self.payInfo.payBankNum = item.B2cNum;
+                _self.payInfo.payBankNum = item.b2C;
             }
         },
         copyLinkPaySubmitFn:function(){//复制网银支付链接
@@ -559,87 +651,6 @@ var payContainer = new Vue({
                 _self.isReceiptStatus = true;
             });
         },
-        // 网银支付会员
-        payVipPcMallPay: function(){
-            console.log('网银支付会员');
-            var _self = this;
-            var params = {
-                bankCode: this.payInfo.payBankNum,
-                returnUrl: 'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
-                userType: _self.payInfo.payUserType,
-                vipRecordId: _self.vipRecordId
-            };
-            PayApi.PayVipPcMallPay(params, function (response) {
-                if (response.code == 0) {
-                    _self.isPayAlert = true;
-                    _self.isSubMitStatus = false;
-                    _self.mbOrderId = response.data.data.mbOrderId;
-                    window.open(response.data.data.payUrl);
-                } else {
-                    _self.isSubMitStatus = false;
-                    CAIMEI.Alert(response.msg, '确定', false);
-                }
-            });
-        },
-        // 支付宝支付会员
-        payVipAliPay: function(){
-            console.log('支付宝支付会员');
-            var _self = this;
-            var params = {
-                bankCode: _self.payInfo.payBankNum,
-                returnUrl: 'https://www.caimei365.com/',
-                userType: _self.payInfo.payUserType,
-                vipRecordId: _self.vipRecordId
-            };
-            console.log(params);
-            PayApi.PayVipAliPay(params, function(response){
-                console.log(response);
-                if (response.code === 0) {
-                    _self.isPayAlert = true;
-                    _self.mbOrderId = response.data.data.mbOrderId;
-                    _self.payInfo.payMobileUrl = response.data.data.payUrl;
-                    _self.payInfo.payData = {
-                        mbOrderId: _self.mbOrderId,
-                        type: _self.payInfo.payBankNum,
-                        amount: _self.payAmount,
-                        url: _self.payInfo.payMobileUrl,
-                    };
-                    CAIMEI.Storage.setItem('payData', JSON.stringify(_self.payInfo.payData));
-                    if (!isPC) {
-                        location.href = _self.payInfo.payMobileUrl;
-                    } else {
-                        window.open("/pay/caimei-paymobile.html?pageType=2&duration=" + _self.comboInfo.duration);
-                    }
-                } else {
-                    CAIMEI.Alert(response.msg, '确定', false);
-                    _self.isSubMitStatus = false;
-                }
-            });
-        },
-        // 微信支付会员
-        payVipMiniWxPay: function(){
-            if (!isPC) {
-                var orderInfo = {//普通订单微信二维码参数
-                    pageType: 2,
-                    vipId: this.comboInfo.id,
-                    vipRecordId: this.vipRecordId,
-                    payAmount: this.payAmount
-                };
-                this.payInfo.payMobileUrl = "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 = this.payInfo.payMobileUrl;
-            } else {
-                this.payInfo.payData = {
-                    type: this.payInfo.payBankNum,
-                    vipId: this.comboInfo.id,
-                    vipRecordId: this.vipRecordId,
-                    amount: this.payAmount,
-                    duration: this.comboInfo.duration,
-                };
-                CAIMEI.Storage.setItem('payData', JSON.stringify(this.payInfo.payData));
-                window.open("/pay/caimei-paymobile.html?pageType=2");
-                this.isPayAlert = true;
-            }
-        },
     },
     mounted: function () {
         var _self = this;
@@ -658,6 +669,8 @@ var payContainer = new Vue({
             // CAIMEI.Storage.removeItem('comboInfo');
             // 设置支付金额
             this.payAmount = _self.toFixedFn(this.comboInfo.price);
+            this.getBankList(); // 获取银行列表
+
         } else {
             var HrefType = CAIMEI.getUrlParam('type');
             if (HrefType == 'payfirm') {
@@ -668,7 +681,8 @@ var payContainer = new Vue({
                 _self.payInfo.payOrderId = data.data.orderId;
                 _self.orderIdentificationId = '#' + _self.payInfo.payOrderId + '#';
             }
-            _self.infoPayOrderCheckoutCounter();//正常订单初始化
+            this.getBankList(); // 获取银行列表
+            this.infoPayOrderCheckoutCounter();//正常订单初始化
         }
         var viewer = window.navigator.userAgent.toLowerCase();
         if(viewer.match(/MicroMessenger/i) == 'micromessenger'){

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

@@ -43,10 +43,10 @@ var payContainer = new Vue({
                 this.WxRequestPaymentFn();
             }
         },
-        // 会员支付
-        WxRequestPaymentVipFn: function(){
+        WxRequestPaymentVipFn: function(){ // 会员支付
             var _this = this;
             var params = {
+                payType:'GZH',
                 code: _this.wechatcode,
                 state: _this.rand(1000, 9999),
                 vipId: _this.vipId,
@@ -77,6 +77,7 @@ var payContainer = new Vue({
         WxRequestsecondHandPay:function(){ // 二手商品支付
             var _this = this;
             var params = {
+                payType:'GZH',
                 code: _this.wechatcode,
                 state: _this.rand(1000, 9999),
                 productId: _this.productId,
@@ -106,7 +107,8 @@ var payContainer = new Vue({
         WxRequestPaymentFn:function(){ // 普通订单支付
             var _this = this;
             var params={
-                    payAmount:Math.round(_this.payAmount*100),
+                    payType:'GZH',
+                    payAmount:_this.payAmount,
                     code:_this.wechatcode,
                     state:_this.rand(1000,9999),
                     orderId:_this.orderID,

src/main/resources/static/js/product/list.js

@@ -179,13 +179,15 @@ var productList = new Vue({
         },
         choiceBrandHref: function (brand, index) {// PC端跳转链接
             window.location.href =  '/product/list.html?keyword=' + encodeURIComponent(this.params.keyword) +
+                                    '&sortField=' + this.params.sortField+'&sortType=' + this.params.sortType+
                                     '&bpn=' + brand.id + '&pro=' + this.params.promotionFlag +
                                     '&newg='+ this.params.newFlag;
         },
         choiceBrandAllHref:function(){// PC全部品牌跳转链接
             window.location.href =  '/product/list.html?keyword=' + encodeURIComponent(this.params.keyword) +
-                '&bpn=&pro=' + this.params.promotionFlag +
-                '&newg='+ this.params.newFlag;
+                                    '&sortField=' + this.params.sortField+'&sortType=' + this.params.sortType+
+                                    '&bpn=&pro=' + this.params.promotionFlag +
+                                    '&newg='+ this.params.newFlag;
         },
         choiceBrand:function(brand,index){// 选择品牌
             var _self = this;
@@ -234,11 +236,13 @@ var productList = new Vue({
         hanldCheckedActiviHref(){// 选择促销商品选项跳转链接(PC专用)
             var promotionFlag = this.isActiviChecked ? 0 : 1;
             window.location.href = '/product/list.html?keyword='+encodeURIComponent(this.params.keyword)+
+                                   '&sortField=' + this.params.sortField+'&sortType=' + this.params.sortType+
                                    '&bpn='+this.hrefBrandId+ '&pro='+promotionFlag+'&newg='+ this.params.newFlag;
         },
         hanldCheckedNewsHref(){// 选择新品选项跳转链接(PC专用)
             var newFlag = this.isNewsChecked ? 0 : 1;
             window.location.href = '/product/list.html?keyword='+encodeURIComponent(this.params.keyword)+
+                                   '&sortField=' + this.params.sortField+'&sortType=' + this.params.sortType+
                                    '&bpn='+this.hrefBrandId+ '&pro=' + this.params.promotionFlag +
                                    '&newg='+newFlag;
         },

src/main/resources/templates/pay/caimei-pay.html

@@ -154,15 +154,16 @@
             <div class="pay-bank">
                 <div class="bank-title">请选择以下一家银行进行付款<span class="color">(请在倒计时时间内使用<span class="big"> {{ payInfo.payLinkTypeText }} </span>完成本次支付)</span></div>
                 <div class="bank-list" id="bankContent" v-if="payInfo.payLinkType == 1">
-                    <a href="javascript:void(0);" v-if="item.B2bNum" v-for="(item, index) in B2BbankData" :key="index" :class="{ active: tabIndex === index }"  @click="changeTab(index,item)">
-                        <img :src="item.imgUrl" :alt="item.bankName">
+                    <a href="javascript:void(0);" v-for="(item, index) in bankListData" :key="index" :class="{ active: tabIndex === index }"  @click="changeTab(index,item)">
+                        <img :src="item.bankLogo" :alt="item.bankName">
                     </a>
                 </div>
                 <div class="bank-list" id="bankContentC" v-if="payInfo.payLinkType == 2">
-                    <a href="javascript:void(0);" v-if="item.B2cNum" v-for="(item, index) in B2CbankData" :key="index" :class="{ active: tabIndex === index }"  @click="changeTab(index,item)">
-                        <img :src="item.imgUrl" :alt="item.bankName">
+                    <a href="javascript:void(0);" v-for="(item, index) in bankListData" :key="index" :class="{ active: tabIndex === index }"  @click="changeTab(index,item)">
+                        <img :src="item.bankLogo" :alt="item.bankName">
                     </a>
                 </div>
+                <div class="iframe" v-html="iframe" style="display: none;"></div>
             </div>
         </div>
         <div class="pay-button-main">

src/main/resources/templates/pay/caimei-paycash.html

@@ -99,25 +99,25 @@
                                 <a v-if="isPC" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(1,'WEIXIN')" :class="{ active: mobileTabIndex === 1 }">
                                     <img src="/img/pay/iconbank-wx@2x.png" alt="微信支付">
                                 </a>
-                                <a href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(2,'ICBC_B2B')" :class="{ active: mobileTabIndex === 2 }">
+                                <a href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(2,'ICBC')" :class="{ active: mobileTabIndex === 2 }">
                                     <img src="/img/pay/iconbank-B2Bbank@2x.png" alt="企业网银">
                                 </a>
-                                <a href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(3,'ICBC_B2C')" :class="{ active: mobileTabIndex === 3 }">
+                                <a href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(3,'ICBC')" :class="{ active: mobileTabIndex === 3 }">
                                     <img src="/img/pay/iconbank-B2Cbank@2x.png" alt="个人网银">
                                 </a>
                             </div>
                         </div>
                         <div class="pay-bank"  v-if="mobileTabIndex === 2 && isPC">
                             <div class="bank-list mfw" id="bankContent">
-                                <a href="javascript:void(0);" class="bank-b mIcon" v-for="(item, index) in B2BbankData" :key="index" :class="{ active: bankTabIndex === index }"  @click="checkBankPay(index,item)">
-                                    <img :src="item.imgUrl" :alt="item.bankName">
+                                <a href="javascript:void(0);" class="bank-b mIcon" v-for="(item, index) in bankListData" :key="index" :class="{ active: bankTabIndex === index }"  @click="checkBankPay(index,item)">
+                                    <img :src="item.bankLogo" :alt="item.bankName">
                                 </a>
                             </div>
                         </div>
                         <div class="pay-bank"  v-if="mobileTabIndex === 3 && isPC">
                             <div class="bank-list mfw" id="bankB2CContent">
-                                <a href="javascript:void(0);" class="bank-b mIcon" v-for="(item, index) in B2CbankData" :key="index" :class="{ active: bankTabIndex === index }"  @click="checkBankPay(index,item)">
-                                    <img :src="item.imgUrl" :alt="item.bankName">
+                                <a href="javascript:void(0);" class="bank-b mIcon" v-for="(item, index) in bankListData" :key="index" :class="{ active: bankTabIndex === index }"  @click="checkBankPay(index,item)">
+                                    <img :src="item.bankLogo" :alt="item.bankName">
                                 </a>
                             </div>
                         </div>
@@ -128,6 +128,9 @@
                                 <p v-if="!isPC">复制支付链接成功后，将链接发送到电脑端进行付款</p>
                             </div>
                         </template>
+                        <template>
+                            <div class="iframe" v-html="iframe" style="display: none;"></div>
+                        </template>
                     </div>
                     <div class="payment" id="offlinePayment" v-if="tabIndex === 1">
                         <div class="payment-transfer">