Merge branch 'dev3.3' into release

src/web/templates/weixin/commonPay/bidfile/bidfiledetail.html

@@ -295,7 +295,7 @@
                 }, 1000)
                 $(".invoice").hide();//隐藏开发票
                 $(".j-footer").show().html("<button class='j-button-confirm' style='width: 100%!important;' >去支付</button>").on("click", function () {
-                    window.location.href = "/weixin/pay/checkout_member?orderCode=" + orderCode;
+                    window.location.href = "/weixin/pay/checkout_bidfile?orderCode=" + orderCode;
                 })
             }
             if (r.data.order_status == -2 || r.data.order_status == -3) {