zhengjinyi 3 лет назад
Родитель
Сommit
36002bbb8d

+ 18 - 0
src/main/java/com/caimei/www/controller/authorized/PayController.java

@@ -12,6 +12,12 @@ public class PayController extends BaseController {
     /** 微信小程序网银支付链接页 */
     private static final String CAIMAI_PAYCASH= "pay/caimei-paycash";
 
+    /** 合利宝线上支付收银台页 */
+    private static final String CAIMAI_HLBPAY= "pay/caimei-hlbpay";
+
+    /** 微信小程序网银支付链接页 */
+    private static final String CAIMAI_PAYLIST= "pay/caimei-paylist";
+
     /** 微信小程序网银支付链接页 */
     private static final String CAIMAI_MOBILE = "pay/caimei-paymobile";
 
@@ -41,6 +47,18 @@ public class PayController extends BaseController {
     @GetMapping("/pay/caimei-paycash.html")
     public String caimeiPayCash() {return CAIMAI_PAYCASH; }
 
+    /**
+     * 订单支付初始化页面
+     */
+    @GetMapping("/pay/caimei-hlbpay.html")
+    public String caimeiHlbpay() {return CAIMAI_HLBPAY; }
+
+    /**
+     * 移动支付扫码页
+     */
+    @GetMapping("/pay/caimei-paylist.html")
+    public String caimeiPayList() {return CAIMAI_PAYLIST; }
+
     /**
      * 移动支付扫码页
      */

+ 84 - 0
src/main/resources/static/css/pay/caimei-paylist.css

@@ -0,0 +1,84 @@
+/**
+ * PC端
+ */
+@media screen and (min-width:768px){
+    .head-wrap{width: 100%;height: 81px;float: left;background-color: #FFFFFF;margin-bottom: 26px;}
+    .head-wrap .inner{width:1184px;height: 81px;margin: 0 auto;    background-color: #FFFFFF;}
+    .head-wrap .logo{width:68px;height: 81px;float: left;}
+    .head-wrap .logo a{width:68px;height: 81px;display: block;}
+    .head-wrap .logo a img{width:68px;height: 81px;display: block;}
+    .head-wrap .text{height: 81px;float: left;margin-left: 10px;line-height: 81px;font-size: 30px;color: #333333;}
+    .pay-container {width: 100%;min-height: 436px;position: relative;margin-bottom: 60px;}
+    .pay-container .container{opacity:0;}
+    .pay-container .container.active{opacity: 1;}
+    .pay-content{width: 1184px;margin: 0 auto;height: 436px;box-sizing: border-box;}
+    .pay-content .pay-title{width: 100%;height: 52px;box-sizing: border-box;padding: 12px 0}
+    .pay-content .pay-title-le{float: left;line-height: 28px;font-size: 16px;color: #333333;font-weight: bold;}
+    .pay-content .pay-title-le span{line-height: 28px;font-size: 14px;color: #E15616;font-weight: normal;}
+    .pay-content .pay-title-btn{float: right;padding: 0 10px;background: #1890F9;height: 28px;line-height: 28px;text-align: center;border-radius: 4px;font-size: 12px;color: #FFFFFF;cursor: pointer;}
+    .pay-list-title{width: 100%;height: 56px;background-color: #FFFFFF;padding: 0 16px;box-sizing: border-box;margin-bottom: 10px;}
+    .pay-list-title .pay-list-view{float: left;line-height: 56px;font-size: 14px;color: #627386;text-align: left;}
+    .pay-list-title .pay-list-view.t1{width: 40%;}
+    .pay-list-title .pay-list-view.t2{width: 30%;}
+    .pay-list-title .pay-list-view.t3{width: 15%;}
+    .pay-list-title .pay-list-view.t4{width: 15%;}
+    .pay-list-cell{width: 100%;height: auto;box-sizing: border-box;padding: 0 16px 20px 16px;background-color: #FFFFFF;margin-bottom: 10px;}
+    .pay-list-cell .list-cell-title{width: 100%;height:60px;box-sizing: border-box;padding:10px 0;border-bottom: 1px solid #E1E1E1;}
+    .pay-list-cell .list-cell-title .list-cell-logo{width: 40px;height: 40px;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;float: left;}
+    .pay-list-cell .list-cell-title .list-cell-logo img{width: 39px;height: 39px;display: block;}
+    .pay-list-cell .list-cell-title .list-cell-name {float: left;margin-left: 16px;line-height: 40px;font-size: 16px;color: #333333;}
+    .pay-list-cell .list-cell-content{width: 100%;height: 134px;box-sizing: border-box;padding: 17px 0;}
+    .pay-list-cell .list-cell-pros{float: left;}
+    .pay-list-cell .list-cell-pros.p1{width: 40%;}
+    .pay-list-cell .list-cell-pros.p2{width: 30%;}
+    .pay-list-cell .list-cell-pros.p3{width: 15%;}
+    .pay-list-cell .list-cell-pros.p4{width: 15%;}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-image{width: 100px;height: 100px;float: left;margin-right: 16px;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-image img{width: 100%;height: 100%;display: block;}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-name{width: 300px;float: left;height: 100px;box-sizing: border-box;padding:30px 0;}
+    .pay-list-cell .list-cell-pros.p1 .cell-pros-name p{width: 100%;font-size: 16px;line-height: 20px;color: #22272E;text-align: left;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+    .pay-list-cell .list-cell-pros.p2,.pay-list-cell .list-cell-pros.p3,.pay-list-cell .list-cell-pros.p4{font-size: 16px;line-height: 100px;color: #22272E;text-align: left;}
+
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+    body{min-width: 100%;background-color: #FFFFFF;}
+    footer{display: none;}
+    .head-wrap{width: 100%;height: 16vw;border: 1px solid #EBEBEB;}
+    .head-wrap .inner{width: 35vw;height: 16vw;}
+    .head-wrap .logo{width:13.6vw;height: 16vw;float: left;}
+    .head-wrap .logo a{width:13.6vw;height: 16vw;display: block;}
+    .head-wrap .logo a img{width:13.6vw;height: 16vw;display: block;}
+    .head-wrap .text{height: 16vw;float: left;margin-left: 10px;line-height: 16vw;font-size: 6vw;color: #333333;}
+    .pay-container {width: 100%;min-height: 100%;position: relative;margin-bottom: 0;}
+    .pay-container .container{opacity:0;}
+    .pay-container .container.active{opacity: 1;}
+    .pay-content{width: 100%;margin: 0 auto;height:100%;margin-top: 0;background: #FFFFFF;box-sizing: border-box;padding: 0;}
+    .pay-content.weixin{border: none;}
+    .pay-content.ali{border: none;}
+    .pay-codecontent{width: 100%;height: auto;float: left;padding:  0 2.4vw;box-sizing: border-box;}
+    .pay-codecontent .pay-amount{width:  100%;height: auto;float: left;}
+    .pay-codecontent .pay-amount .pay-amount-text{width: 100%;height: auto;float: left;margin-bottom: 4vw;}
+    .pay-codecontent .pay-amount .pay-amount-text p{font-size: 4vw;text-align: center;color: #333;line-height: 8vw;}
+    .pay-codecontent .pay-amount .pay-amount-text p span{margin-left: 5px;}
+    .pay-codecontent .pay-amount .pay-amount-icon{display: none;}
+    .pay-codecontent .pay-codemain{width: 100%;height: auto;float: right;position: relative;}
+    .pay-codecontent .pay-codemain .code-title{width: 100%;height:8vw;line-height:8vw;font-size: 4vw;color: #333333;margin-bottom: 20px;text-align: center;font-weight: bold;}
+    .pay-codecontent .pay-codemain .code-title span{color: #E15616;}
+    .pay-codecontent .pay-codemain .pay-qrCode{width: 220px;height: 220px;position: relative;margin: 0 auto;padding: 8px;border: 2px solid #ebebeb;}
+    .pay-codecontent .pay-codemain .pay-qrCode.weixin{border-color:#7AD237 ;}
+    .pay-codecontent .pay-codemain .pay-qrCode.ali{border-color:#26A1EE ;}
+    .pay-codecontent .pay-codemain .pay-qrCode i{width: 48px;height: 48px;display: block;position: absolute;top: 0;left: 0;right: 0;bottom: 0;margin: auto;}
+    .pay-codecontent .pay-codemain .pay-qrCode .icon-alipay{background: url("/img/pay/icon-ali@2x.png")no-repeat;background-size: contain;}
+    .pay-codecontent .pay-codemain .pay-qrCode .icon-wechat{background: url("/img/pay/icon-wechatpay@2x.png")no-repeat;background-size: contain;}
+    .pay-codecontent .pay-codemain .code-footer{width: 100%;height: 33px;line-height: 33px;font-size: 14px;color: #333333;text-align: center;margin-top: 10vw;}
+    .pay-codecontent .pay-codemain .code-footer .code-img{width: 84px;height: 28px;display: block;margin: 0 auto;}
+    .pay-codemain .model{position: absolute;width: 240px;height: 240px;top: 54px;left:18vw;display: flex;justify-content: center;align-items: center;background: rgba(255,255,255,1);color: #999;z-index: 99999;border: 1px solid #EBEBEB;}
+    .pay-codemain .model .refresh{width: 21px;height: 21px;display: block;margin: 0 auto;margin-bottom: 3px;}
+    .pay-codemain .model  .refresh-div{width: 100px;height: auto;display: block;}
+    .pay-codemain .model  .refresh-div p{text-align: center;font-size: 14px;line-height: 20px;}
+
+}

+ 37 - 3
src/main/resources/static/js/common/serviceapi/pay.service.js

@@ -28,7 +28,7 @@ var PayApi = {
                 callback(res);
             });
         },
-        PayOrderPcMallPay: function (params, callback) {// 正常订单网银支付
+        PayOrderPcMallPay: function (params, callback) {// 米花正常订单网银支付
             Http.AjaxService({
                 url:'/order/pay/union',
                 type:'POST',
@@ -184,8 +184,6 @@ var PayApi = {
                 callback(res);
             });
         },
-
-
         /*---------------------支付vip接口---------------------------*/
 
         PayVipPcMallPay: function(params, callback){ // vip网银支付
@@ -286,4 +284,40 @@ var PayApi = {
                 callback(res);
             });
         },
+        PayOrderPcScanAliPay: function (params, callback) {// 正常订单合利宝支付宝支付
+            Http.AjaxService({
+                url:'/order/pay/scan/pay',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        PayOrdersecondScanAliPay: function (params, callback) {//二手发布合利宝支付宝支付
+            Http.AjaxService({
+                url:'/order/pay/second/scan',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        PayVipScanAliPay: function(params, callback){ // vip支付宝合利宝支付
+            Http.AjaxService({
+                url:'/order/pay/vip/scan',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
 };

+ 870 - 0
src/main/resources/static/js/pay/caimei-hlbpay.js

@@ -0,0 +1,870 @@
+/**
+ *Created by ZHJY on 2020/7/14.
+ */
+var payContainer = new Vue({
+    el:"#payContainer",
+    data: {
+        isSubMitStatus:false,
+        payInfo:{
+            payBankNum: 'ICBC_B2B', //支付类型
+            payOrderId: '',  //订单ID
+            payUnpaidaMount: '', //待支付金额
+            payAmount: 0,//本次支付金额
+            payMobileUrl: '',//二维码生成链接
+            payData:{},       //支付数据
+            payUserType:'ENTERPRISE',
+            payType:'',
+        },
+        iframe:'',
+        couponInfo:{},
+        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'}
+        ],
+        pageType:'',//页面跳转类型 1 二手支付
+        paidAmount:'',//订单待付金额
+        payableAmount:'',//应付金额
+        receiptAmount:'',//已支付金额
+        balanceAmount:'',//应付剩余金额
+        payAmount:'',//本次支付金额
+        paymentIimit:5000,
+        paymentIimitText:'',
+        discernReceiptList:[],//支付记录列表
+        tabIndex:0,//支付方式 0 移动支付 1网银支付 2线下转账
+        mbOrderId:'',//支付订单ID
+        bigPayInfo:{},// 银联转账信息
+        BankUserType:1,
+        mobileTabIndex:null,
+        bankTabIndex:0,
+        isRequest:false,
+        isPayAlert:false,
+        isPayBigAlert:false,
+        isPaySwitch:false,
+        paySuccessCounter:'',
+        bankPayLink_url:'',
+        orderIdentificationId:'',//订单标识
+        receiptStatus:'',
+        invoiceStatus:false,
+        isReceiptStatus:false,
+        onlinePay:'',
+        payStatusText:'使用任何一种线上支付方式支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。',
+        productID:'',//发布商品的ID
+        is_Wechat_bowcr:false,
+        comboInfo: null, //选中的svip套餐信息
+        vipRecordId: undefined,
+        couponRecordId:undefined,
+        couponId:undefined,
+        userId:0
+    },
+    filters: {
+        NumFormat:function(value) {
+            if(!value) return '0.00';
+            var intPart = Number(value) - Number(value)%1; //获取整数部分(这里是windy93的方法)
+            var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,'); //将整数部分逢三一断
+            var floatPart = ".00"; //预定义小数部分
+            var value2Array = value.toString().split(".");
+            if(value2Array.length == 2) {  //=2表示数据有小数位
+                floatPart = value2Array[1].toString(); //拿到小数部分
+                if(floatPart.length == 1) { //补0,实际上用不着
+                    return intPartFormat + "." + floatPart + '0';
+                } else {
+                    return intPartFormat + "." + floatPart;
+                }
+            } else {
+                return intPartFormat + floatPart;
+            }
+        }
+    },
+    methods: {
+        initCouponDetail:function (couponId) {//初始化优惠券数据
+            var _self = this;
+            ProductApi.QueryCouponDetail({ couponId: couponId },function (response) {
+                if(response.code == 0){
+                    _self.couponInfo = response.data
+                    if(globalUserData){
+                        _self.userId = globalUserData.userId;
+                    }
+                }else{
+                    CAIMEI.Alert(response.msg, '确定', false);
+                }
+            })
+        },
+        infoPayOrderCheckoutCounter:function(){//初始化订单数据
+            var _self = this;
+            PayApi.PayOrderCheckoutCounter({orderId:_self.payInfo.payOrderId},function(response){
+                if(response.code == 0){
+                    // console.log(response);
+                    var data = response.data; //金额初始化
+                    _self.payInfo.payUnpaidaMount = (data.order.payableAmount - data.order.receiptAmount).toFixed(2);
+                    _self.payInfo.payAmount = (data.order.payableAmount-data.order.receiptAmount).toFixed(2);
+                    _self.discernReceiptList = data.discernReceipt;
+                    _self.paidAmount =  (data.order.payableAmount-data.order.receiptAmount).toFixed(2);
+                    _self.receiptAmount =  data.order.receiptAmount;
+                    _self.payableAmount=  data.order.payableAmount;
+                    _self.balanceAmount =  ( _self.payableAmount - _self.receiptAmount).toFixed(2) - _self.payInfo.payAmount;
+                    _self.payAmount =  (_self.payableAmount - _self.receiptAmount).toFixed(2);//本次支付金额
+                    _self.paySuccessCounter = data.order.paySuccessCounter;
+                    _self.receiptStatus =  data.order.receiptStatus;
+                    _self.onlinePay = data.onlinePay;
+                    if(_self.receiptAmount>0){
+                        _self.payStatusText = '使用任何一种线上支付方式支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。';
+                        _self.isReceiptStatus = false;
+                    }else{
+                        _self.payStatusText = '使用任何一种线上支付方式支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。';
+                        _self.isReceiptStatus = true;
+                    }
+                    _self.isRequest = true;
+                    _self.PayOrderOnLineSwitch();
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+            })
+        },
+        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){
+                if(response.code == 0){
+                    if(response.data === 0){
+                        _self.isPaySwitch = true;
+                        if (_self.pageType === '2') {
+                            CAIMEI.dialog('支付系统遇到点小问题,请稍后重试', false);
+                            return;
+                        }
+                        CAIMEI.Alert('线上支付功能正在维护中,请前往订单详情页面查看线下转账方式后进行付款','确定',true,function(){
+                            window.location.href='/user/order/detail.html?orderId='+_self.payInfo.payOrderId;
+                        });
+                    }
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+            })
+        },
+        PayMobileSubmitFn:function(){//点击移动支付方式
+            var _self = this;
+            if(_self.isPaySwitch && _self.pageType === '2'){
+                CAIMEI.dialog('支付系统遇到点小问题,请稍后重试', false);
+                return;
+            }
+            if(_self.pageType === '3'){// 移动支付优惠券
+                _self.PayCouponMiniPayFn();
+            }else{
+                if(_self.onlinePay == 2){
+                    _self.layerConfirm();
+                }else{
+                    if(_self.payInfo.payBankNum == ''){
+                        CAIMEI.dialog('请选择支付方式');
+                        return;
+                    }
+                    if(_self.payAmount == ''){
+                        CAIMEI.dialog('请输入本次支付金额');
+                        return;
+                    }
+                    if(_self.payAmount == 0){
+                        CAIMEI.dialog('本次支付金额不能为0');
+                        return;
+                    }
+                    if(_self.payAmount*100 < 2){
+                        CAIMEI.dialog('本次支付金额必须大于¥0.02');
+                        return;
+                    }
+                    if(_self.payAmount > _self.paymentIimit){
+                        switch (_self.payInfo.payBankNum) {
+                            case 'WEIXIN':
+                                _self.paymentIimitText = '本次支付金额已超出微信支付限额,请输入小于5千的金额进行支付';
+                                break;
+                            case 'ALIPAY':
+                                _self.paymentIimitText = '本次支付金额已超出支付宝限额,请输入小于5千的金额进行支付';
+                                break;
+                        }
+                        CAIMEI.Alert(_self.paymentIimitText,'知道了');
+                        return;
+                    }
+                    if(_self.payInfo.payBankNum == "WEIXIN"){// 微信
+                        if(_self.pageType === '1'){ // 二手
+                            _self.PaySecondMiniWxPay();
+                        }else if(_self.pageType === '2'){ // 会员
+                            _self.payVipMiniWxPay();
+                        }else{ // 正常订单
+                            _self.PayOrderMiniWxPay();
+                        }
+                    }else if(_self.payInfo.payBankNum == "ALIPAY"){// 支付宝
+                        if(_self.pageType === '1'){// 二手
+                            _self.PayOrdersecondScanAliPay();
+                        }else if(_self.pageType === '2'){ // 会员
+                            _self.PayVipScanAliPay();
+                        }else{// 正常订单
+                            _self.PayOrderPcScanAliPay();
+                        }
+                    }
+                }
+            }
+        },
+        PaySubmitFn:function(){//点击网银支付方式
+            var _self = this;
+            if(_self.isPaySwitch && _self.pageType === '2'){
+                CAIMEI.dialog('支付系统遇到点小问题,请稍后重试', false);
+                return;
+            }
+            if(_self.pageType === '3'){// 网银支付优惠券
+                _self.PayCouponUnionPayFn();
+            }else{
+                if(_self.onlinePay == 2){
+                    _self.layerConfirm();
+                }else{
+                    if(_self.payInfo.payBankNum == ''){
+                        CAIMEI.dialog('请选择银行!');
+                        return;
+                    }
+                    if(_self.payAmount <= 10){
+                        CAIMEI.dialog('网银支付的金额必须大于¥10.00');
+                        return;
+                    }
+                    if(_self.pageType === '1'){// 二手
+                        _self.PayOrdersecondUnion();
+                    } else if (_self.pageType === '2') { // 会员
+                        _self.payVipPcMallPay();
+                    } else {// 正常订单
+                        _self.PayOrderPcMallPay();
+                    }
+                }
+            }
+        },
+        PayOrderMiniWxPay:function (){// 正常订单微信支付通道
+            var _self = this;
+            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;
+            }
+        },
+        PayOrderPcScanAliPay:function (){// 正常订单支付宝通道
+            var _self = this;
+            var params = {//正常订单
+                payType:'ZFBEWM',
+                payAmount:_self.payAmount,
+                returnUrl:'https://www.caimei365.com/',
+                orderId:_self.payInfo.payOrderId
+            };
+            _self.isSubMitStatus=true;
+            PayApi.PayOrderPcScanAliPay(params,function(response){
+                if(response.code == 0){
+                    console.log('data',response.data)
+                    _self.isPayAlert = true;
+                    _self.isSubMitStatus=false;
+                    _self.mbOrderId = response.data.rt5_orderId;
+                    _self.payInfo.payMobileUrl = response.data.rt8_qrcode;
+                    _self.payInfo.payData = {
+                        mbOrderId:_self.mbOrderId,
+                        type:_self.payInfo.payBankNum,
+                        orderid:_self.payInfo.payOrderId,
+                        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=1");
+                    }
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                    _self.isSubMitStatus=false;
+                }
+            })
+        },
+        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;
+            }
+        },
+        PayOrdersecondScanAliPay:function (){// 二手发布支付宝通道
+            var _self = this;
+            var params = {//二手
+                payType:'ZFBEWM',
+                returnUrl:'https://www.caimei365.com/',
+                productId:_self.productID,
+            };
+            _self.isSubMitStatus=true;
+            PayApi.PayOrdersecondScanAliPay(params,function(response){
+                if(response.code == 0){
+                    _self.isPayAlert = true;
+                    _self.isSubMitStatus=false;
+                    _self.mbOrderId = response.data.rt5_orderId;
+                    _self.payInfo.payMobileUrl = response.data.rt8_qrcode;
+                    _self.payInfo.payData = {
+                        mbOrderId:_self.mbOrderId,
+                        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");
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                    _self.isSubMitStatus=false;
+                }
+            })
+        },
+        PayOrdersecondUnion:function (){// 二手发布网银支付通道
+            var _self = this;
+            var params = {//二手
+                payType:'YL',
+                bankCode:_self.payInfo.payBankNum,
+                returnUrl:'https://www.caimei365.com/pay/success.html?pageType=second&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.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;
+            }
+        },
+        PayVipScanAliPay: 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.PayVipScanAliPay(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(){// 超级会员网银支付通道
+            var _self = this;
+            var params = {
+                payType:'YL',
+                bankCode: this.payInfo.payBankNum,
+                returnUrl: 'https://www.caimei365.com/pay/success.html?pageType=vip&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);
+                }
+            });
+        },
+        PayCouponUnionPayFn: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.couponInfo.moneyCouponPrice,
+                userType: _self.payInfo.payUserType,
+                couponId: _self.couponId,
+                couponRecordId:_self.couponRecordId,
+                userId:_self.userId,
+                source:2 //支付来源 1 小程序 2 WWW
+            };
+            PayApi.PayCouponUnionPay(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);
+                }
+            });
+        },
+        PayCouponMiniPayFn:function () {  // 移动支付购买优惠券
+            var _self = this;
+            if(_self.payInfo.payBankNum == "WEIXIN"){
+                _self.payCouponMiniWxPay();
+            }else if(_self.payInfo.payBankNum == "ALIPAY"){//支付宝支付
+                _self.payCouponAliPay();
+            }
+        },
+        payCouponMiniWxPay: function(){ // 微信支付优惠券
+            console.log('微信支付优惠券');
+            if (!isPC) {
+                var orderInfo = {//普通订单微信二维码参数
+                    pageType: 3,
+                    payAmount: this.couponInfo.moneyCouponPrice,
+                    couponRecordId:this.couponRecordId,
+                    couponId: this.couponId,
+                    userId : this.userId
+                };
+                this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&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,
+                    amount: this.couponInfo.moneyCouponPrice,
+                    url: this.payInfo.payMobileUrl,
+                    couponId:this.couponId,
+                    couponRecordId:this.couponRecordId,
+                    userId:this.userId
+                };
+                CAIMEI.Storage.setItem('payData', JSON.stringify(this.payInfo.payData));
+                window.open("/pay/caimei-paymobile.html?pageType=3");
+                this.isPayAlert = true;
+            }
+        },
+        payCouponAliPay: function(){ // 支付宝支付优惠券
+            var _self = this;
+            console.log('支付宝支付优惠券');
+            var params = {
+                returnUrl: 'https://www.caimei365.com/',
+                couponId: _self.couponInfo.couponId,
+                userId:_self.userId,
+                couponRecordId:_self.couponRecordId,
+                source:2 //支付来源 1 小程序 2 WWW
+            };
+            PayApi.PayCouponMiniAliPay(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 = {
+                        type: _self.payInfo.payBankNum,
+                        mbOrderId: _self.mbOrderId,
+                        amount: _self.couponInfo.moneyCouponPrice,
+                        url: _self.payInfo.payMobileUrl,
+                        couponId:_self.couponId,
+                        userId:_self.userId
+                    };
+                    CAIMEI.Storage.setItem('payData', JSON.stringify(_self.payInfo.payData));
+                    if (!isPC) {
+                        location.href = _self.payInfo.payMobileUrl;
+                    } else {
+                        window.open("/pay/caimei-paymobile.html?pageType=3");
+                    }
+                } else {
+                    CAIMEI.Alert(response.msg, '确定', false);
+                    _self.isSubMitStatus = false;
+                }
+            });
+        },
+        changePayAmount:function(event){//输入支付金额控制
+            var _self = this;
+            var value = event.target.value;
+            if(value == "" || value <0 ){//判断是否等于0 或者为空
+                _self.payAmount = '';
+                _self.payInfo.payAmount = _self.payInfo.payUnpaidaMount;
+                _self.balanceAmount = _self.toFixedFn(_self.payInfo.payUnpaidaMount);
+                return;
+            }else if(Number(value) > _self.payInfo.payUnpaidaMount){//判断大于应付金额
+                _self.payAmount = _self.payInfo.payUnpaidaMount;
+                _self.payInfo.payAmount =  _self.payAmount;
+                _self.balanceAmount = _self.toFixedFn(_self.payInfo.payUnpaidaMount-_self.payInfo.payAmount);
+            }else{
+                _self.payAmount = value;
+                _self.payInfo.payAmount = _self.payAmount;
+                _self.balanceAmount = _self.toFixedFn(_self.payInfo.payUnpaidaMount-_self.payInfo.payAmount);
+            }
+        },
+        changePayAmountBlur:function(event){//失去焦点设置金额
+            var _self = this;
+            _self.payAmount = _self.toFixedFn(event.target.value);
+            _self.payInfo.payAmount = _self.payAmount;
+        },
+        changeTab:function(index,item){//选择支付方式切换
+            this.tabIndex = index;
+            switch (this.tabIndex) {
+                case 0:
+                    this.payInfo.payBankNum = 'ALIPAY';
+                    break;
+                case 1:
+                    this.payInfo.payBankNum = '';
+                    break;
+            }
+        },
+        checkMobilePay:function(index,bankNum){//选择移动支付方式
+            var _self = this;
+            _self.mobileTabIndex = index;
+            _self.payInfo.payBankNum = bankNum;
+            switch (index) {
+                case 2:// 企业网银
+                    _self.bankTabIndex = 0
+                    _self.payInfo.payType = '1';
+                    _self.payInfo.payUserType = 'ENTERPRISE';
+                    break;
+                case 3:// 个人网银
+                    _self.bankTabIndex = 0
+                    _self.payInfo.payType = '2';
+                    _self.payInfo.payUserType = 'USER';
+                    break;
+                case 4:// 大额网银
+                    _self.bankTabIndex = 0
+                    _self.payInfo.payType = '2';
+                    _self.payInfo.payUserType = 'USER';
+                    break;
+            }
+        },
+        checkBankPay:function(index,item){//选择网银支付方式-选择银行
+            var _self = this;
+            _self.bankTabIndex = index;
+            switch (_self.mobileTabIndex) {
+                case 2:// 企业网银
+                    _self.payInfo.payBankNum = item.b2B;
+                    break;
+                case 3:// 个人网银
+                    _self.payInfo.payBankNum = item.b2C;
+                    break;
+                case 4:// 大额网银
+                    _self.bankTabIndex = 0
+                    _self.payInfo.payType = '2';
+                    _self.payInfo.payUserType = 'USER';
+                    break;
+            }
+        },
+        copyLinkPaySubmitFn:function(){//复制网银支付链接
+            var _self = this;
+            if(_self.isPaySwitch && _self.pageType === '2'){
+                CAIMEI.dialog('支付系统遇到点小问题,请稍后重试', false);
+                return;
+            }
+            if(_self.onlinePay == 2){
+                _self.layerConfirm();
+            }else{
+                if(_self.payAmount == ''){
+                    CAIMEI.dialog('请输入本次支付金额');
+                    return;
+                }
+                if(_self.payAmount == 0){
+                    CAIMEI.dialog('本次支付金额不能为0');
+                    return;
+                }
+                if(_self.payAmount <= 10){
+                    CAIMEI.dialog('网银支付的金额必须大于¥12.00');
+                    return;
+                }
+
+                var params = {};
+
+                if(_self.pageType == 2){
+                    params = {
+                        unpaidAmount:_self.payAmount,
+                        vipRecordId: _self.vipRecordId,
+                        payType:_self.payInfo.payType,
+                    }
+                }else{
+                    params = {
+                        unpaidAmount:_self.payAmount,
+                        orderId:_self.payInfo.payOrderId,
+                        payType:_self.payInfo.payType
+                    }
+                }
+                PayApi.PayOrderPayLink(params,function(response){
+                        _self.bankPayLink_url = response.data;
+                        var oInput = document.createElement("textarea");
+                        oInput.value = _self.bankPayLink_url;
+                        document.body.appendChild(oInput);
+                        oInput.select(); // 选择对象
+                        document.execCommand("Copy"); // 执行浏览器复制命令
+                        document.body.removeChild(oInput);
+                        CAIMEI.dialog('复制成功');
+                    }
+                )
+            }
+        },
+        copyOrderBtnSubmitFn:function(){//复制订单标识
+            var _self = this;
+            var oInput = document.createElement("textarea");
+            oInput.value = _self.orderIdentificationId;
+            document.body.appendChild(oInput);
+            oInput.select(); // 选择对象
+            document.execCommand("Copy"); // 执行浏览器复制命令
+            document.body.removeChild(oInput);
+            CAIMEI.dialog('复制成功');
+        },
+        hidePayAlert:function(){//隐藏已支付弹窗
+            var _self = this;
+            _self.isPayAlert = false;
+        },
+        RefreshBody:function(){//刷新页面
+            var _self = this;
+            if(_self.payInfo.payBankNum == 'WEIXIN'){
+                if( _self.pageType == '2' ){ // 验证支付(支付会员)
+                    PayApi.PayOrderPayVipCheck({recordId : _self.vipRecordId},function(response){
+                        // console.log(response);
+                        if(response.code === 0){
+                            _self.windowLocationHref('success');
+                        }else{
+                            _self.windowLocationHref('error');
+                        }
+                    });
+                }else if(_self.pageType == '3'){ // 验证支付(优惠券)
+                    PayApi.PayOrderPayCouponCheck({ couponRecordId: _self.couponRecordId },function(response){
+                        // console.log(response);
+                        if(response.code === 0){
+                            _self.windowLocationHref('success');
+                        }else{
+                            _self.windowLocationHref('error');
+                        }
+                    });
+                }else{
+                    PayApi.PayOrderPayWhetherSuccess({orderId: _self.payInfo.payOrderId, paySuccessCounter:_self.paySuccessCounter},function(response){
+                        _self.isPayAlert = false;
+                        if(response.code === 0){
+                            _self.windowLocationHref('success');
+                        }else{
+                            _self.windowLocationHref('error');
+                        }
+                    });
+                }
+            }else{
+                PayApi.PayOrderFindOrderStatus({mbOrderId:_self.mbOrderId},function(response){
+                    _self.isPayAlert = false;
+                    var data = response.data.data;
+                    if(data.status === '1'){
+                        _self.windowLocationHref('success');
+                    }else{
+                        _self.windowLocationHref('error');
+                    }
+                });
+            }
+        },
+        RefreshBigBody:function () {// 校验是否完成银联支付
+            var _self = this;
+            PayApi.PayOrderFindOrderStatus({mbOrderId:_self.mbOrderId},function(response){
+                _self.isPayBigAlert = false;
+                var data = response.data.data;
+                if(data.status === '1'){
+                    setTimeout(()=>{
+                        window.location.href = '/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount;
+                    },1000)
+                }else{
+                    setTimeout(()=>{
+                        window.location.href = '/pay/success.html?pageType=unionPay&type=error&payAmount='+_self.payAmount+'&orderId='+_self.payInfo.payOrderId;
+                    },1000)
+                }
+            });
+        },
+        windowLocationHref:function(state){
+            var _self = this;
+            if( _self.pageType === '1'){
+                window.location.href = '/pay/success.html?pageType=second&type='+state+'&payAmount='+_self.payAmount;
+            }else if(_self.pageType === '2'){
+                window.location.href = '/pay/success.html?pageType=vip&type='+state+'&payAmount='+_self.payAmount;
+            }else if(_self.pageType === '3') {
+                window.location.href = '/pay/success.html?pageType=coupon&type=' + state + '&payAmount=' + _self.couponInfo.moneyCouponPrice;
+            }else{
+                window.location.href = '/pay/success.html?pageType=www&type='+state+'&payAmount='+_self.payAmount;
+            }
+        },
+        payTypeText:function(state){//处理支付记录文字
+            var stateText = '',
+                stateTextObject={
+                    12:'网银',
+                    13:'微信支付',
+                    14:'支付宝',
+                    15:'微信支付',
+                    16:'余额抵扣',
+                    20:'大额银联转账',
+                };
+            Object.keys(stateTextObject).forEach(function(key) {
+                if(key == state){
+                    stateText = stateTextObject[key]
+                }
+            });
+            return stateText;
+        },
+        toFixedFn:function(text){//处理小数点后两位数
+            return Number(text).toFixed(2);
+        },
+        layerConfirm:function(){
+            var _self = this;
+            CAIMEI.Alert('本次交易暂不支持线上支付,请使用线下转账方式付款。','知道了',true,function () {
+                _self.payStatusText = '使用任何一种线上支付方式支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。';
+                _self.isReceiptStatus = true;
+            });
+        },
+        closeBigAlert:function () {
+            this.isPayBigAlert = false
+        }
+    },
+    mounted: function () {
+        var _self = this;
+        // 判断当前支付是订单支付
+        this.pageType = CAIMEI.getUrlParam('pageType');
+        if (this.pageType === '1') {//二手
+            this.productID = CAIMEI.getUrlParam('productID');
+            this.payAmount = _self.toFixedFn(100);
+            this.isRequest = true;
+            this.payStatusText = '';
+        } else if (this.pageType === '2') { // 支付会员
+            this.vipRecordId = parseInt(CAIMEI.getUrlParam('vipRecordId'));
+            this.PayOrderOnLineSwitch();
+            // 从本地获取选中的svip套餐信息后删除本地信息
+            this.comboInfo = JSON.parse(CAIMEI.Storage.getItem('comboInfo'));
+            // CAIMEI.Storage.removeItem('comboInfo');
+            // 设置支付金额
+            this.payAmount = this.toFixedFn(this.comboInfo.price);
+            // 获取银行列表
+            this.getBankList();
+        } else if(this.pageType === '3') {// 支付优惠券
+            this.couponId = parseInt(CAIMEI.getUrlParam('couponId'));
+            this.couponRecordId = parseInt(CAIMEI.getUrlParam('couponRecordId'));
+            this.initCouponDetail(this.couponId);
+            this.PayOrderOnLineSwitch();
+            this.getBankList();
+        }else{
+            var HrefType = CAIMEI.getUrlParam('type');
+            if (HrefType == 'payfirm') {
+                this.payInfo.payOrderId = CAIMEI.getUrlParam('orderId');
+                this.orderIdentificationId = '#' + this.payInfo.payOrderId + '#';
+            } else {
+                var data = JSON.parse(localStorage.getItem("confirmOrderInfo"));
+                this.payInfo.payOrderId = data.data.orderId;
+                this.orderIdentificationId = '#' + this.payInfo.payOrderId + '#';
+            }
+            // 获取银行列表
+            this.getBankList();
+            //正常订单初始化
+            this.infoPayOrderCheckoutCounter();
+        }
+        var viewer = window.navigator.userAgent.toLowerCase();
+        if(viewer.match(/MicroMessenger/i) == 'micromessenger'){
+            this.is_Wechat_bowcr = true;
+            this.payInfo.payBankNum = 'WEIXIN';
+            this.mobileTabIndex = 1;
+        }else{
+            this.is_Wechat_bowcr = false;
+            this.payInfo.payBankNum = 'ALIPAY';
+            this.mobileTabIndex = 0;
+        }
+    }
+});

+ 293 - 291
src/main/resources/static/js/pay/caimei-paycash.js

@@ -192,85 +192,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=wx91c4152b60ca91a3&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=wx91c4152b60ca91a3&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.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);
+                            _self.PayOrdersecondAliPay();
+                        }else if(_self.pageType === '2'){ // 会员
+                            _self.PayVipAliPay();
+                        }else{// 正常订单
+                            _self.PayOrderPcMallAlipay();
                         }
                     }
                 }
@@ -297,13 +233,7 @@ var payContainer = new Vue({
                         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);
+                        _self.PayOrdersecondUnion()
                     } else if (_self.pageType === '2') { // 网银付会员
                         _self.payVipPcMallPay();
                     } else {
@@ -314,52 +244,84 @@ var payContainer = new Vue({
                             }
                             _self.PayOrderTransferUnion(params);
                         }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.PayOrderPcMallPay();
                         }
                     }
                 }
             }
         },
-        PayOrderPcMallPay:function(params){// 正常订单网银支付
+        PayOrderMiniWxPay:function () {// 正常订单微信支付
+            var _self = this;
+            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=wx91c4152b60ca91a3&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;
+            }
+        },
+        PaySecondMiniWxPay:function () {// 二手发布微信支付
             var _self = this;
+            if(!isPC){
+                var orderInfo = {//二手微信二维码参数
+                    pageType:1,
+                    productId:_self.productID,
+                    payAmount:_self.payAmount
+                };
+                _self.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&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;
+            }
+        },
+        PayOrdersecondScanAliPay:function () {// 二手发布支付宝支付
+            var _self = this;
+            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.isSubMitStatus=true;
-            PayApi.PayOrderPcMallPay(params,function(response){
+            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);
                 }else{
-                    _self.isSubMitStatus=false;
                     CAIMEI.Alert(response.msg,'确定',false);
-                }
-            })
-        },
-        PayOrderTransferUnion:function (params) {// 大额网银转账
-            var _self = this;
-            _self.isSubMitStatus=true;
-            PayApi.PayOrderTransferUnion(params,function(response){
-                if(response.code == 0){
-                    _self.isPayBigAlert = true;
                     _self.isSubMitStatus=false;
-                    _self.mbOrderId = response.data.data.mbOrderId;
-                    _self.bigPayInfo = JSON.parse(response.data.data.payInfo)
-                    console.log('bigPayInfo',_self.bigPayInfo)
-                }else{
-                    _self.isSubMitStatus=false;
-                    CAIMEI.Alert(response.msg,'确定',false);
                 }
             })
         },
-        PayOrderPcMallAlipay:function (params){// 正常订单支付宝支付
+        PayOrderPcMallAlipay:function (){// 正常订单支付宝支付
             var _self = this;
+            var params = {//正常订单
+                payAmount:Math.round(_self.payAmount*100),
+                returnUrl:'https://www.caimei365.com/',
+                orderId:_self.payInfo.payOrderId
+            };
             _self.isSubMitStatus=true;
             PayApi.PayOrderPcMallAlipay(params,function(response){
                 if(response.code == 0){
@@ -386,8 +348,50 @@ var payContainer = new Vue({
                 }
             })
         },
-        PayOrdersecondAliPay:function (params){// 二手支付宝支付
+        PayOrderPcMallPay:function(){// 正常订单网银支付
+            var _self = this;
+            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.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);
+                }
+            })
+        },
+        PayOrderTransferUnion:function (params) {// 大额网银转账
+            var _self = this;
+            _self.isSubMitStatus=true;
+            PayApi.PayOrderTransferUnion(params,function(response){
+                if(response.code == 0){
+                    _self.isPayBigAlert = true;
+                    _self.isSubMitStatus=false;
+                    _self.mbOrderId = response.data.data.mbOrderId;
+                    _self.bigPayInfo = JSON.parse(response.data.data.payInfo)
+                    console.log('bigPayInfo',_self.bigPayInfo)
+                }else{
+                    _self.isSubMitStatus=false;
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+            })
+        },
+        PayOrdersecondAliPay:function (){// 二手支付宝支付
             var _self = this;
+            var params = {//二手
+                returnUrl:'https://www.caimei365.com/',
+                productId:_self.productID,
+            };
             _self.isSubMitStatus=true;
             PayApi.PayOrdersecondAliPay(params,function(response){
                 if(response.code == 0){
@@ -410,8 +414,13 @@ var payContainer = new Vue({
                 }
             })
         },
-        PayOrdersecondUnion:function (params){// 二手网银支付
+        PayOrdersecondUnion:function (){// 二手网银支付
             var _self = this;
+            var params = {//二手
+                payWay:_self.payInfo.payBankNum,
+                returnUrl:'https://www.caimei365.com/',
+                productId:_self.productID,
+            };
             _self.isSubMitStatus=true;
             PayApi.PayOrdersecondUnion(params,function(response){
                 if(response.code == 0){
@@ -425,6 +434,178 @@ var payContainer = new Vue({
                 }
             })
         },
+        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 = {//普通订单微信二维码参数
+                    couponId: 2,
+                    vipId: this.comboInfo.id,
+                    vipRecordId: this.vipRecordId,
+                    payAmount: this.payAmount
+                };
+                this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&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;
+            }
+        },
+        PayCouponUnionPayFn: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.couponInfo.moneyCouponPrice,
+                userType: _self.payInfo.payUserType,
+                couponId: _self.couponId,
+                couponRecordId:_self.couponRecordId,
+                userId:_self.userId,
+                source:2 //支付来源 1 小程序 2 WWW
+            };
+            PayApi.PayCouponUnionPay(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);
+                }
+            });
+        },
+        PayCouponMiniPayFn:function () {  // 移动支付购买优惠券
+            var _self = this;
+            if(_self.payInfo.payBankNum == "WEIXIN"){
+                _self.payCouponMiniWxPay();
+            }else if(_self.payInfo.payBankNum == "ALIPAY"){//支付宝支付
+                _self.payCouponAliPay();
+            }
+        },
+        payCouponMiniWxPay: function(){// 微信支付优惠券
+            console.log('微信支付优惠券');
+            if (!isPC) {
+                var orderInfo = {//普通订单微信二维码参数
+                    pageType: 3,
+                    payAmount: this.couponInfo.moneyCouponPrice,
+                    couponRecordId:this.couponRecordId,
+                    couponId: this.couponId,
+                    userId : this.userId
+                };
+                this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&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,
+                    amount: this.couponInfo.moneyCouponPrice,
+                    url: this.payInfo.payMobileUrl,
+                    couponId:this.couponId,
+                    couponRecordId:this.couponRecordId,
+                    userId:this.userId
+                };
+                CAIMEI.Storage.setItem('payData', JSON.stringify(this.payInfo.payData));
+                window.open("/pay/caimei-paymobile.html?pageType=3");
+                this.isPayAlert = true;
+            }
+        },
+        payCouponAliPay: function(){// 支付宝支付优惠券
+            var _self = this;
+            console.log('支付宝支付优惠券');
+            var params = {
+                returnUrl: 'https://www.caimei365.com/',
+                couponId: _self.couponInfo.couponId,
+                userId:_self.userId,
+                couponRecordId:_self.couponRecordId,
+                source:2 //支付来源 1 小程序 2 WWW
+            };
+            PayApi.PayCouponMiniAliPay(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 = {
+                        type: _self.payInfo.payBankNum,
+                        mbOrderId: _self.mbOrderId,
+                        amount: _self.couponInfo.moneyCouponPrice,
+                        url: _self.payInfo.payMobileUrl,
+                        couponId:_self.couponId,
+                        userId:_self.userId
+                    };
+                    CAIMEI.Storage.setItem('payData', JSON.stringify(_self.payInfo.payData));
+                    if (!isPC) {
+                        location.href = _self.payInfo.payMobileUrl;
+                    } else {
+                        window.open("/pay/caimei-paymobile.html?pageType=3");
+                    }
+                } else {
+                    CAIMEI.Alert(response.msg, '确定', false);
+                    _self.isSubMitStatus = false;
+                }
+            });
+        },
         changePayAmount:function(event){//输入支付金额控制
             var _self = this;
             var value = event.target.value;
@@ -660,185 +841,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 = {//普通订单微信二维码参数
-                    couponId: 2,
-                    vipId: this.comboInfo.id,
-                    vipRecordId: this.vipRecordId,
-                    payAmount: this.payAmount
-                };
-                this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&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;
-            }
-        },
-        // 网银支付购买优惠券
-        PayCouponUnionPayFn: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.couponInfo.moneyCouponPrice,
-                userType: _self.payInfo.payUserType,
-                couponId: _self.couponId,
-                couponRecordId:_self.couponRecordId,
-                userId:_self.userId,
-                source:2 //支付来源 1 小程序 2 WWW
-            };
-            PayApi.PayCouponUnionPay(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);
-                }
-            });
-        },
-        // 移动支付购买优惠券
-        PayCouponMiniPayFn:function () {
-            var _self = this;
-            if(_self.payInfo.payBankNum == "WEIXIN"){
-                _self.payCouponMiniWxPay();
-            }else if(_self.payInfo.payBankNum == "ALIPAY"){//支付宝支付
-                _self.payCouponAliPay();
-            }
-        },
-        // 微信支付优惠券
-        payCouponMiniWxPay: function(){
-            console.log('微信支付优惠券');
-            if (!isPC) {
-                var orderInfo = {//普通订单微信二维码参数
-                    pageType: 3,
-                    payAmount: this.couponInfo.moneyCouponPrice,
-                    couponRecordId:this.couponRecordId,
-                    couponId: this.couponId,
-                    userId : this.userId
-                };
-                this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&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,
-                    amount: this.couponInfo.moneyCouponPrice,
-                    url: this.payInfo.payMobileUrl,
-                    couponId:this.couponId,
-                    couponRecordId:this.couponRecordId,
-                    userId:this.userId
-                };
-                CAIMEI.Storage.setItem('payData', JSON.stringify(this.payInfo.payData));
-                window.open("/pay/caimei-paymobile.html?pageType=3");
-                this.isPayAlert = true;
-            }
-        },
-        // 支付宝支付优惠券
-        payCouponAliPay: function(){
-            var _self = this;
-            console.log('支付宝支付优惠券');
-            var params = {
-                returnUrl: 'https://www.caimei365.com/',
-                couponId: _self.couponInfo.couponId,
-                userId:_self.userId,
-                couponRecordId:_self.couponRecordId,
-                source:2 //支付来源 1 小程序 2 WWW
-            };
-            PayApi.PayCouponMiniAliPay(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 = {
-                        type: _self.payInfo.payBankNum,
-                        mbOrderId: _self.mbOrderId,
-                        amount: _self.couponInfo.moneyCouponPrice,
-                        url: _self.payInfo.payMobileUrl,
-                        couponId:_self.couponId,
-                        userId:_self.userId
-                    };
-                    CAIMEI.Storage.setItem('payData', JSON.stringify(_self.payInfo.payData));
-                    if (!isPC) {
-                        location.href = _self.payInfo.payMobileUrl;
-                    } else {
-                        window.open("/pay/caimei-paymobile.html?pageType=3");
-                    }
-                } else {
-                    CAIMEI.Alert(response.msg, '确定', false);
-                    _self.isSubMitStatus = false;
-                }
-            });
-        },
         closeBigAlert:function () {
             this.isPayBigAlert = false
         }

+ 141 - 0
src/main/resources/static/js/pay/caimei-paylist.js

@@ -0,0 +1,141 @@
+/**
+ *Created by ZHJY on 2020/7/14.
+ */
+var payContainer = new Vue({
+    el:"#payContainer",
+    data: {
+        loginLoading:true,
+        payInfo:{
+            payType:'',//支付类型 WEIXIN 微信支付  ALIPAY 支付宝支付
+            payOrderId:'', //订单ID
+            payAmount:0,
+            payUnpaidAmount:0,//本次支付金额
+            payMobileUrl:'',//URL
+        },
+        list: [
+            {
+                shopName: '浙江瑞琪',
+                shopLogo: 'https://img.caimei365.com/group1/M00/00/16/rB-lF2JOpeWARn0MAAk4fk2riSg966.png',
+                coupon: 20000,
+                paidAmount: 2000,
+                payAmount: 1000,
+                paystaut: 0,
+                cartList: [
+                    {
+                        name: '韩国恩盛进口氢洁气小气泡清韩国恩盛盛进口氢洁气小气泡清气小气泡清气小气泡清',
+                        unit: '10ml/盒',
+                        num: 1,
+                        price: 500000,
+                        productCode: 'SXSASDADA',
+                        image: 'https://img.caimei365.com/group1/M00/00/16/rB-lF2JOpeWARn0MAAk4fk2riSg966.png'
+                    },
+                    {
+                        name: '韩国恩盛进口氢洁气小气泡清韩国恩盛盛进口氢洁气小气泡清气小气泡清气小气泡清',
+                        unit: '10ml/盒',
+                        num: 1,
+                        price: 500000,
+                        productCode: 'SXSASDADA',
+                        image: 'https://img.caimei365.com/group1/M00/00/16/rB-lF2JOpeWARn0MAAk4fk2riSg966.png'
+                    }
+                ]
+            },
+            {
+                shopName: '华熙生物',
+                shopLogo: 'https://img.caimei365.com/group1/M00/00/16/rB-lF2JOpeWARn0MAAk4fk2riSg966.png',
+                coupon: 20000,
+                paidAmount: 2000,
+                payAmount: 1000,
+                paystaut: 0,
+                cartList: [
+                    {
+                        name: '韩国恩盛进口氢洁气小气泡清韩国恩盛盛进口氢洁气小气泡清气小气泡清气小气泡清',
+                        unit: '10ml/盒',
+                        num: 1,
+                        price: 500000,
+                        productCode: 'SXSASDADA',
+                        image: 'https://img.caimei365.com/group1/M00/00/16/rB-lF2JOpeWARn0MAAk4fk2riSg966.png'
+                    },
+                    {
+                        name: '韩国恩盛进口氢洁气小气泡清韩国恩盛盛进口氢洁气小气泡清气小气泡清气小气泡清',
+                        unit: '10ml/盒',
+                        num: 1,
+                        price: 500000,
+                        productCode: 'SXSASDADA',
+                        image: 'https://img.caimei365.com/group1/M00/00/16/rB-lF2JOpeWARn0MAAk4fk2riSg966.png'
+                    }
+                ]
+            },
+            {
+                shopName: '采美快递物流商',
+                shopLogo: 'https://img.caimei365.com/group1/M00/00/16/rB-lF2JOpeWARn0MAAk4fk2riSg966.png',
+                coupon: 0,
+                paidAmount: 0,
+                payAmount: 10,
+                paystaut: 1,
+                cartList: [
+                    {
+                        name: '运费',
+                        unit: '',
+                        num: 1,
+                        price: 10,
+                        image:
+                            'https://www.caimei365.com/uploadFile/product/2020-04-16/DV8ZXHKHIA20200416112227.jpg'
+                    }
+                ]
+            }
+        ],
+        isRequest:false,
+        orderId:0,
+        userId:0
+    },
+    filters: {
+        NumFormat:function(value) {
+            //处理金额
+            if (value) {
+                return Number(value).toFixed(2)
+            } else {
+                return '0.00'
+            }
+        }
+    },
+    methods: {
+        infoPayOrderCheckoutCounter:function(){//初始化订单数据
+            var _self = this;
+            PayApi.PayOrderCheckoutCounter({orderId:_self.orderId},function(response){
+                if(response.code == 0){
+                    // console.log(response);
+                    var data = response.data;
+                    _self.orderNo = data.order.orderNo;
+                    _self.paySuccessCounter = data.order.paySuccessCounter;
+                    _self.payInfo.payAmount = data.order.payableAmount-data.order.receiptAmount;
+                    _self.loginLoading = false;
+                    _self.isRequest = true;
+                    switch (_self.payInfo.payType) {
+                        case 'WEIXIN':
+                            _self.getWrchatQrcodeShow();
+                            break;
+                        case 'ALIPAY':
+                            _self.getAliPayQrcodeInfo();
+                            break;
+                    }
+
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+            })
+        },
+        hidePayAlert:function(){//隐藏已支付弹窗
+            var _self = this;
+            _self.isPayAlert = false;
+        },
+        toFixedFn:function(text){//处理小数点后两位数
+            return Number(text).toFixed(2);
+        },
+    },
+    mounted: function () {
+        var _self = this;
+        _self.orderId = CAIMEI.getUrlParam('orderId');
+        console.log(_self.payInfo.payType);
+        _self.infoPayOrderCheckoutCounter();
+    }
+});

+ 3 - 3
src/main/resources/static/js/user-center/order/detail.js

@@ -227,7 +227,7 @@ var orderPage = new Vue({
                                 _self.modelType = 3;
                                 _self.showModelTypePop();
                             }else{
-                                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderId='+_self.orderId;
+                                window.location.href = '/pay/caimei-hlbpay.html?type=payfirm&orderId='+_self.orderId;
                             }
                     }
                 }else{
@@ -246,7 +246,7 @@ var orderPage = new Vue({
                             _self.modelType = 3;
                             _self.showModelTypePop();
                         } else {
-                            window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderId='+_self.orderId;
+                            window.location.href = '/pay/caimei-hlbpay.html?type=payfirm&orderId='+_self.orderId;
                         }
                     }
                 } else {
@@ -260,7 +260,7 @@ var orderPage = new Vue({
                 _self.modelType = 3;
                 _self.showModelTypePop();
             }else{
-                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderId='+_self.orderId;
+                window.location.href = '/pay/caimei-hlbpay.html?type=payfirm&orderId='+_self.orderId;
             }
         },
         hidePaymentConfirm:function(){//隐藏弹窗

+ 3 - 3
src/main/resources/static/js/user-center/order/list.js

@@ -304,7 +304,7 @@ var orderPage = new Vue({
                                 _self.modelType = 3;
                                 _self.showModelTypePop();
                             }else{
-                                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderId='+orderId;
+                                window.location.href = '/pay/caimei-hlbpay.html?type=payfirm&orderId='+orderId;
                             }
                     }
                 }else{
@@ -323,7 +323,7 @@ var orderPage = new Vue({
                             _self.modelType = 3;
                             _self.showModelTypePop();
                         } else {
-                            window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderId='+_self.hanldOrderData.orderId;
+                            window.location.href = '/pay/caimei-hlbpay.html?type=payfirm&orderId='+_self.hanldOrderData.orderId;
                         }
                     }
                 } else {
@@ -337,7 +337,7 @@ var orderPage = new Vue({
                 _self.modelType = 3;
                 _self.showModelTypePop();
             }else{
-                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderId='+_self.hanldOrderData.orderId;
+                window.location.href = '/pay/caimei-hlbpay.html?type=payfirm&orderId='+_self.hanldOrderData.orderId;
             }
         },
         hidePaymentConfirm:function(){//隐藏弹窗

+ 227 - 0
src/main/resources/templates/pay/caimei-hlbpay.html

@@ -0,0 +1,227 @@
+<!DOCTYPE html>
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://www.thymeleaf.org ">
+<head>
+    <title>采美365网</title>
+    <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/pay/caimei-paycash.css(v=${version})}" rel="stylesheet" type="text/css">
+    <template th:replace="components/analysis"></template>
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+<div id="payContainer" class="pay-container clear" v-cloak>
+    <div class="wrap" v-if="pageType !== '2' && pageType !== '3'">
+        <div class="pageTitle">
+            <div class="step">
+                <span class="prev">我的购物车</span>
+                <span class="prev">核对订单信息</span>
+                <span class="on">成功提交订单</span>
+            </div>
+            <h1>收银台</h1>
+        </div>
+    </div>
+    <div class="container">
+        <div class="pay-content clear" >
+            <!--二手支付-->
+            <template v-if="pageType === '1'">
+                <div class="pay-title">
+                    <div class="title-money big">
+                        <p class="pay-money-big">付款金额:<span class="red">¥{{payAmount | NumFormat}}</span></p>
+                    </div>
+                </div>
+            </template>
+            <!--购买会员-->
+            <template v-else-if="pageType === '2'">
+                <div class="pay-svip">
+                    <div class="pay-svip-title">购买超级会员</div>
+                    <div class="content">
+                        <div class="pay-svip-detail">
+                            <div class="tit">支付金额</div>
+                            <div class="pay-amount"><span>¥</span>{{ comboInfo.price | NumFormat }}</div>
+                        </div>
+                        <div class="svip-indent">套餐{{ comboInfo.duration }}个月</div>
+                    </div>
+                </div>
+            </template>
+            <!--购买优惠券-->
+            <template v-else-if="pageType === '3'">
+                <div class="pay-coupontitle">收银台</div>
+                <div class="pay-coupon">
+                    <div class="pay-coupon-title">购买优惠券 <span>(满¥{{ couponInfo.touchPrice }}减{{ couponInfo.couponAmount }})</span></div>
+                    <div class="pay-coupon-content">待付金额:<span>¥{{ couponInfo.moneyCouponPrice | NumFormat }}</span></div>
+                </div>
+            </template>
+            <!--普通订单-->
+            <template v-else>
+                <div class="pay-title">
+                    <div class="title-money big">
+                        <p class="pay-money-big">待付金额:<span class="red" id="paidAmount">¥{{paidAmount | NumFormat}}</span></p>
+                    </div>
+                    <div class="title-money">
+                        <p>应付总额:<span id="payableAmount">¥{{payableAmount | NumFormat}}</span></p>
+                        <p>已付金额:<span id="receiptAmount">¥{{receiptAmount | NumFormat}}</span></p>
+                    </div>
+                    <div class="pay-input">
+                        <p>本次支付:</p>
+                        <p class="input-text">
+                            <span>¥</span>
+                            <input class="input" id="payAmount" v-model="payAmount" type="number" placeholder="输入金额不能大于待付金额" maxlength="10" @input="changePayAmount" @blur="changePayAmountBlur">
+                        </p>
+                    </div>
+                    <div class="title-money">
+                        <p>应付剩余:<span class="red" id="balanceAmount">¥{{balanceAmount | NumFormat}}</span></p>
+                    </div>
+                </div>
+            </template>
+            <div class="pay-ment"  v-if="pageType != '1' && pageType != '2' && pageType != '3'">
+                <div class="pay-record">
+                    <div class="record-title">支付记录</div>
+                    <div class="record-content clear" id="discernReceipt">
+                        <div class="record-li none" v-if="discernReceiptList.length== 0">暂无支付记录</div>
+                        <div class="record-li" v-for="(item, index) in discernReceiptList" :key="index" v-else>
+                            <div class="record-tb">¥{{item.receiptAmount | NumFormat}}</div>
+                            <div class="record-tb">{{payTypeText(item.payType)}}</div>
+                            <div class="record-tb">{{item.receiptDate}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="pay-method">
+                <div class="method-title">选择支付方式</div>
+                <div class="pay-method-tab mf">
+                    <a class="item" href="javascript:void(0);" @click="changeTab(0)" :class ="{ active: tabIndex === 0 }">线上支付</a>
+                    <a class="item" href="javascript:void(0);" @click="changeTab(1)" :class ="{ active: tabIndex === 1 }" v-if="isReceiptStatus">线下转账</a>
+                </div>
+                <div class="method-content">
+                    <div class="payment" id="mobilePayment" v-if="tabIndex === 0">
+                        <template v-if="pageType !== '2' && pageType != '3'">
+                            <div class="payment-title">1.{{payStatusText}}</div>
+                            <div class="payment-title">2.大额支付请使用大额银联转账方式进行付款。</div>
+                        </template>
+                        <div class="pay-bank">
+                            <div class="bank-list" id="mobileContent">
+                                <a v-if="!is_Wechat_bowcr" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(0,'ALIPAY')" :class="{ active: mobileTabIndex === 0 }">
+                                    <img src="/img/pay/iconbank-ali@2x.png" alt="支付宝支付">
+                                </a>
+                                <a v-if="is_Wechat_bowcr && !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 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 }">
+                                    <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 }">
+                                    <img src="/img/pay/iconbank-B2Cbank@2x.png" alt="个人网银">
+                                </a>
+                                <a href="javascript:void(0);" v-if="pageType !== '1' && pageType != '2'  && pageType != '3'" class="bank-a mIcon" @click="checkMobilePay(4,'ICBC_B2C')" :class="{ active: mobileTabIndex === 4 }">
+                                    <img src="/img/pay/iconbank-bigbank@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);" v-if="item.b2B!=''" 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);" v-if="item.b2C!=''" 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>
+                        <template v-if="pageType != '1' && pageType != '3'">
+                            <div class="pay-link" v-if="mobileTabIndex === 2 || mobileTabIndex === 3">
+                                <p v-if="isPC">若您在公司的职位无法直接使用网银付款,请点击右侧“复制支付链接”按钮,将该链接发送给公司财务人员进行网银付款</p>
+                                <a href="javascript:void(0);" id="copyLink" @click="copyLinkPaySubmitFn">复制支付链接</a>
+                                <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">
+                            <div class="payment-transfer-main" id="paymentTransferMain">
+                                <div class="label"><P class="label-title"><i class="icon mIcon"></i>除了线上支付,您还可以通过直接转账的方式付款</P></div>
+                                <div class="label"><P class="label-t">转账信息</P></div>
+                                <div class="label">
+                                    <P class="text">开户行:中信银行(深圳泰然支行)</P>
+                                    <P class="text">银行卡号:6217 6803 0362 0897</P>
+                                    <P class="text">户名:周仁声</P>
+                                </div>
+                                <div class="label">
+                                    <P class="text-p">订单标识:{{orderIdentificationId}}<a href="javascript: void(0);" class="copy" @click="copyOrderBtnSubmitFn">复制</a></P>
+                                </div>
+                                <div class="label"><P class="label-t">特别注意</P></div>
+                                <div class="label"><P class="label-c">请在转账备注中填写上述订单标识,方便财务快速审核,提高发货速度</P></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="pay-button-main" v-if="tabIndex == 0">
+        <div class="inner">
+            <div class="pay-button" v-if="mobileTabIndex === 0">
+                <a href="javascript:void(0);" id="payMobileSubmit" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上支付宝支付','点击','移动支付','','Um_Event_ConfirmMobilePay'])">立即支付</a>
+            </div>
+            <div class="pay-button" v-if="mobileTabIndex === 1">
+                <a href="javascript:void(0);" id="payMobileSubmit1" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上微信支付','点击','移动支付','','Um_Event_ConfirmMobilePay1'])">立即支付</a>
+            </div>
+            <div class="pay-button" v-if="mobileTabIndex === 2">
+                <a v-show="isPC" href="javascript:void(0);" id="paySubmit" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上企业网银支付','点击','网银支付','','Um_Event_CopyUnionPay'])">立即支付</a>
+            </div>
+            <div class="pay-button" v-if="mobileTabIndex === 3">
+                <a v-show="isPC" href="javascript:void(0);" id="paySubmit1" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上个人网银支付','点击','网银支付','','Um_Event_CopyUnionPay2'])">立即支付</a>
+            </div>
+            <div class="pay-button" v-if="mobileTabIndex === 4">
+                <a v-show="isPC" href="javascript:void(0);" id="paySubmit2" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上大额银联支付','点击','网银支付','','Um_Event_CopyUnionPay3'])">立即支付</a>
+            </div>
+        </div>
+    </div>
+    <div class="pay-alert-content" v-if="isPayAlert">
+        <div class="pay-alert">
+            <div class="title"><p>确认提示</p><i class="icon-close" @click.stop="RefreshBody"></i></div>
+            <div class="content">
+                <h1>请在您新打开的页面上完成付款</h1>
+                <p>完成付款后请点击下面的按钮</p>
+            </div>
+            <div class="button" id="payButton"><a href="javascript:void(0);" @click="RefreshBody">已完成支付</a></div>
+        </div>
+    </div>
+    <div class="pay-alert-content" v-if="isPayBigAlert">
+        <div class="pay-big-alert">
+            <div class="title"><p>大额银联转账信息</p><i class="icon-close" @click.stop="closeBigAlert"></i></div>
+            <div class="content">
+                <p class="text">请使用银行手机app或者网银输入以下信息进行转账。 每次发起支付请求,收款账号都会变化,请使用最新的收款账号进行转账。</p>
+                <p>户名: <span>{{ bigPayInfo.receiveName }}</span></p>
+                <p>收款账号: <span>{{ bigPayInfo.receiveAccountNo }}</span></p>
+                <p>银行: <span>{{ bigPayInfo.accountName }}</span></p>
+                <p>收款方开户地: <span>{{ bigPayInfo.areaInfo }}</span></p>
+                <p>收款网点: <span>{{ bigPayInfo.accountName }}</span></p>
+            </div>
+            <div class="button">
+                <a class="btn btn-close" href="javascript:void(0);" @click="closeBigAlert">换种支付方式</a>
+                <a class="btn btn-confirm" href="javascript:void(0);" @click="RefreshBigBody">已完成转账,请点击</a>
+            </div>
+        </div>
+    </div>
+
+</div>
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/pay.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/pay/caimei-bank.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/pay/caimei-hlbpay.js(v=${version})}"></script>
+</body>
+</html>

+ 82 - 0
src/main/resources/templates/pay/caimei-paylist.html

@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://www.thymeleaf.org ">
+<head>
+    <template th:replace="pay/components/pay-link"></template>
+    <link th:href="@{/css/pay/caimei-paylist.css(v=${version})}" rel="stylesheet" type="text/css">
+    <template th:replace="components/analysis"></template>
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+<!-- 内容 -->
+<div class="pay-container weixin clear" id="payContainer" >
+    <div v-if="loginLoading" class="loading" :style="{opacity: loginLoading ? '1' :'0'}">
+        <img src="/img/base/loading.gif">
+    </div>
+    <div class="container" :class="{active: isRequest}" v-show="isRequest">
+        <div class="pay-content">
+            <div class="pay-title">
+                <div class="pay-title-le">支付订单<span>(因线上支付政策调整,请对每家店铺分别进行付款;若需要直接转账支付订单,请点击右侧按钮查看线下转账信息)</span></div>
+                <div class="pay-title-btn">查看线下转账信息</div>
+            </div>
+            <div class="pay-list-title">
+                <div class="pay-list-view t1">商品信息</div>
+                <div class="pay-list-view t2">单价(元)</div>
+                <div class="pay-list-view t3">数量</div>
+                <div class="pay-list-view t4">小计(元)</div>
+            </div>
+            <div class="pay-list-cell clear" v-for="(list, index) in list" :key="index">
+                <div class="list-cell-title">
+                    <div class="list-cell-logo">
+                        <img :src="list.shopLogo" alt="">
+                    </div>
+                    <div class="list-cell-name" v-text="list.shopName"></div>
+                </div>
+                <div class="list-cell-content" v-for="(pros, prosIndex) in list.cartList" :key="prosIndex">
+                    <div class="list-cell-pros p1">
+                        <div class="cell-pros-image">
+                            <img :src="pros.image" alt="">
+                        </div>
+                        <div class="cell-pros-name">
+                            <p v-text="pros.name"></p>
+                        </div>
+                    </div>
+                    <div class="list-cell-pros p2">
+                        <p>¥{{pros.price  | NumFormat}}</p>
+                    </div>
+                    <div class="list-cell-pros p3">
+                        <p>{{ pros.num }}</p>
+                    </div>
+                    <div class="list-cell-pros p4">
+                        <p>¥{{pros.price | NumFormat}}</p>
+                    </div>
+                </div>
+                <div class="list-cell-button">
+                    <div class="list-cell-msg">
+
+                    </div>
+                    <div class="list-cell-msg">
+
+                    </div>
+                    <div class="list-cell-msg">
+
+                    </div>
+                    <div class="list-cell-btn">
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script src="https://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/pay.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/lib/qrcode.min.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/pay/caimei-paylist.js(v=${version})}"></script>
+
+</body>
+</html>