线上支付开关,删除入驻咨询弹窗,优化二手商品详情放大镜

src/main/resources/static/css/flea-market/secondDetail.css

@@ -31,7 +31,7 @@
     .preview-header .preview-banner-small .item.item-cur {border-color: #e15616;}
     .preview-header .preview-banner-small .item.item-cur img {opacity: 1;}
     .preview-header .preview-box {display: none;overflow: hidden;position: absolute;right: -555px;top: 0;width: 548px;height: 548px;border: 1px solid #e4e4e4;z-index: 9999;background: #FFFFFF;}
-    .preview-header .preview-box img {width: 1096px;height: 1096px;margin-right: 10px;display: block;}
+    .preview-header .preview-box img {width: 1096px;height: 1096px;margin-right: 10px;display: block;max-width:none;}
     .preview-info .preview-info-title {width: 100%;height: auto;float: left;position: relative;}
     .preview-info .preview-info-title .info-p {height: auto;float: left;}
     .preview-info .preview-info-title .info-p.classly {font-size: 14px;color: #999;}

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

@@ -99,6 +99,7 @@ input::-webkit-outer-spin-button {
     .pay-button-main .pay-button a{width: 232px;height: 50px;display: block;background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);border-radius: 2px;font-size: 14px;line-height: 50px;text-align: center;color: #FFF6D9;float: right;}
     .pay-button-main .pay-button a.disabled{background: #EFEFEF;color:#999999;}
     .footTop{margin-top: 0;}
+    .jconfirm .jconfirm-box div.jconfirm-closeIcon{display: none !important;}
 }
 
 
@@ -152,5 +153,5 @@ input::-webkit-outer-spin-button {
     .payment-transfer .copy{display:inline-block;height:6.4vw;line-height:6.4vw;padding:0 3vw;background-image:linear-gradient(214deg,#ff2929 0%,#ff6d1b 100%);border-radius:2px;color:#FFF;margin-left:2vw}
     .pay-button a{display:block;width:93.4vw;height:11.2vw;line-height:11.2vw;font-size:3.7vw;text-align:center;border-radius:2px;border:1px solid #e15616;margin:0 auto 2.6vw auto;color:#FFF;background:#e15616}
     .pay-alert-content{display: none;}
-
+    .jconfirm .jconfirm-box div.jconfirm-closeIcon{display: none !important;}
 }

src/main/resources/static/js/account/register-club.js

@@ -4,7 +4,6 @@ var registerPage = new Vue({
         loginLoading: false,
         showTabContentIndex:1,
         showSupplierConfirm:true,
-        advisoryStatus: false,
         showClass:'',
         mobilCount:0,
         mobileCodeText:'获取验证码',
@@ -14,10 +13,6 @@ var registerPage = new Vue({
         codeImagePath:'https://dss2.bdstatic.com/8_V1bjqh_Q23odCf/pacific/1819816496.jpg',
         codeImageToken:'',
         imageCode:'',
-        advisory:{
-            name: '',
-            phone: ''
-        },
         clubUser: {
             name:'',
             phone:'',
@@ -294,28 +289,6 @@ var registerPage = new Vue({
             var el = event.currentTarget;
             verifyHandle(el);
         },
-        postAdvisory: function(){//机构入驻咨询提交
-            var _self = this;
-            $('.advisoryInfo').find("[needverify]:visible").each(function (index, ele) {
-                if (!$(ele).siblings('.checked').hasClass("show")) {
-                    verifyHandle(ele);
-                }
-            });
-            var pass = ($('.errTips.show:visible').length === 0);
-            if (_self.advisoryStatus) { return false; }
-            this.$nextTick(function(){
-                if (!pass) { return false; }
-                _self.advisoryStatus = true;
-                UserApi.quickConsultation({name: _self.advisory.name,mobile: _self.advisory.phone},function (response) {
-                    _self.advisoryStatus = false;
-                    if(response.code === 0){
-                        CAIMEI.Alert('您的信息已提交成功,采美工作人员会第一时间联系您','确定',false);
-                    } else {
-                        CAIMEI.Alert(response.msg,'确定',false);
-                    }
-                });
-            });
-        },
         uploadBusinessLicenseImageFn: function(event){//上传营业执照
             var _this = this;
             var inputDOM = _this.$refs.businessLicenseImage;

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

@@ -4,6 +4,12 @@
  * auther ZHJY
  */
 var PayApi = {
+        PayOrderOnLineSwitch: function (params, callback) {//网银支付链接初始化数据
+            Http.AjaxService({ url:'/PayOrder/onLineSwitch', type:'GET', data:params, json:true})
+                .then(function(res){
+                    callback(res);
+                });
+        },
         PayOrderCheckoutCounter: function (params, callback) {//网银支付链接初始化数据
             Http.AjaxService({ url:'/PayOrder/checkoutCounter', type:'GET', data:params, json:true})
                 .then(function(res){

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

@@ -124,19 +124,13 @@ var UserApi = {
                 callback(res);
             });
         },
-        quickConsultation : function(params,callback) {//入驻咨询
-            Http.AjaxService({ url:'/club/advisory', type:'post', data:params, json:false})
-            .then(function(res){
-                callback(res)
-            });
-        },
-        BindOrganization : function(params,callback) { //扫码微信绑定机构
+        BindOrganization : function(params,callback) {//扫码微信绑定机构
             Http.AjaxService({ url:'/user/bindOrganization', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)
             });
         },
-       Maintenance : function(params,callback) { //扫码微信绑定机构
+       Maintenance : function(params,callback) {//扫码微信绑定机构
             Http.AjaxService({ url:'/pcCenter/applyMaintenance', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)

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

@@ -55,6 +55,7 @@ var payContainer = new Vue({
         bankTabIndex:0,
         isRequest:false,
         isPayAlert:false,
+        isPaySwitch:false,
         paySuccessCounter:'',
         bankPayLink_url:'',
         orderIdentificationId:'',//订单标识
@@ -111,6 +112,22 @@ var payContainer = new Vue({
                         _self.isReceiptStatus = true;
                     }
                     _self.isRequest = true;
+                    _self.PayOrderOnLineSwitch();
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+            })
+        },
+        PayOrderOnLineSwitch:function(){//获取是否可以先上支付
+            var _self = this;
+            PayApi.PayOrderOnLineSwitch({},function(response){
+                if(response.code == 0){
+                    if(response.data === 0){
+                        _self.isPaySwitch = true;
+                        CAIMEI.Alert('线上支付功能正在维护中，请前往订单详情页面查看线下转账方式后进行付款','确定',true,function(){
+                            window.location.href='/user/order/detail.html?orderId='+_self.payInfo.PAY_ORDERID;
+                        });
+                    }
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }

src/main/resources/static/js/shopping/confirm.js

@@ -132,7 +132,7 @@ var shoppingConfirm = new Vue({
                     _self.payInfo.freight = (r.data.freePostFlag===1 ? r.data.freight : 0);
                     _self.payInfo.orderShouldPayFee = _self.totalPrice + _self.payInfo.freight;
                 }else{
-                    CAIMEI.Alert(response.msg, '确定', false);
+                    CAIMEI.Alert(r.msg, '确定', false);
                 }
             })
         },

src/main/resources/templates/account/register-club.html

@@ -15,30 +15,6 @@
 <div id="registerPage">
     <div class="signAccount clear" v-show="showTabContentIndex == 1">
         <div class="title">欢迎机构入驻</div>
-        <div class="advisory" >
-            <span v-if="isPC" class="icon">入驻咨询</span>
-            <div v-else class="duv" @click="showVadvisory"><span class="mIcon" ></span><span>入驻咨询</span> </div>
-            <div class="mask" :class="showClass" @click="closeVadvisory"></div>
-            <div class="advisoryInfo" :class="showClass">
-                <div class="info">若暂不方便入驻机构或无法入驻，您可以留下您的姓名和联系方式，采美工作人员会第一时间联系您。</div>
-                <div v-if="!isPC" class="icon-close" @click="closeVadvisory"></div>
-                <form>
-                    <div class="formLine">
-                        <p><em>*</em>姓名：</p>
-                        <input type="text" v-model.trim="advisory.name" placeholder="请输入您的姓名" :rule="rule.name" maxlength="6" @blur="blurHandle($event)" unselectable="on" needverify>
-                        <i class="checked icon mIcon"></i>
-                        <span class="errTips icon mIcon" tips="请输入正确的联系人姓名"></span>
-                    </div>
-                    <div class="formLine">
-                        <p><em>*</em>手机号：</p>
-                        <input type="text" v-model.trim="advisory.phone" placeholder="请输入您的常用手机号" :rule="rule.phone" maxlength="11" @blur="blurHandle($event)" needverify>
-                        <i class="checked icon mIcon"></i>
-                        <span class="errTips icon mIcon" tips="请输入有效电话号码"></span>
-                    </div>
-                    <button class="btn" type="button" @click="postAdvisory()">提交</button>
-                </form>
-            </div>
-        </div>
         <div class="registerClub">
             <!--机构注册表单-->
             <form>

src/main/resources/templates/shopping/confirm.html

@@ -209,9 +209,8 @@
         <h2 class="title">发票信息</h2>
         <div class="invoiceWrap">
             <div class="formLine">
-                <label class="diyBox"><input type="radio" name="invoice" v-model="invoice.type" value="0" checked><i class="icon mIcon">不开发票</i></label>
-                <label class="diyBox"><input type="radio" name="invoice" v-model="invoice.type" value="1"><i class="icon mIcon">普通发票</i></label>
-                <label class="diyBox"><input type="radio" name="invoice" v-model="invoice.type" value="2"><i class="icon mIcon">增值税发票</i></label>
+                <label class="diyBox"><input type="radio" name="invoice" v-model="invoice.type" value="0" checked><i class="icon mIcon">不要发票</i></label>
+                <label class="diyBox"><input type="radio" name="invoice" v-model="invoice.type" value="2"><i class="icon mIcon">要发票</i></label>
             </div>
             <div class="invoiceForm" v-show="invoice.type==1"><!--普通发票-->
                 <div class="formLine">

src/main/resources/templates/supplier-center/shop/release.html

@@ -253,11 +253,11 @@
                                     <div class="release-props" >
                                         <label class="release-radio">
                                             <input type="radio" name="invoiceType" v-model="releaseParams.invoiceType" value="1" @click="radioChangeInvoiceType">
-                                            <i class="icon mIcon">开增值税发票</i>
+                                            <i class="icon mIcon">开增值税专用发票</i>
                                         </label>
                                         <label class="release-radio">
                                             <input type="radio" name="invoiceType" v-model="releaseParams.invoiceType" value="2" checked @click="radioChangeInvoiceType">
-                                            <i class="icon mIcon">开普通发票</i>
+                                            <i class="icon mIcon">开增值税普通发票</i>
                                         </label>
                                         <label class="release-radio" v-show="releaseParams.includedTax == 0">
                                             <input type="radio" name="invoiceType" v-model="releaseParams.invoiceType" value="3" checked @click="radioChangeInvoiceType">