Bläddra i källkod

Merge remote-tracking branch 'origin/developerC' into developerD

zhengjinyi 3 år sedan
förälder
incheckning
54e848f3d7

+ 14 - 4
src/main/resources/static/css/flea-market/form.css

@@ -1,6 +1,8 @@
 body{background: #fff}
 .errcolor{border: 1px solid red}
  @media screen and (min-width:768px) {
+     .footTop{float: left;}
+     .footMain{float: left;}
      #secondHandrelease {width: 1184px;margin: auto;}
      .bannerimg{width: 100%;height: auto;}
      .bannerimg img{width: 100%;height: 100%;}
@@ -15,6 +17,10 @@ body{background: #fff}
      .icon.select:before {background-position: -207px -254px;width: 22px;height: 19px;position: absolute;bottom: 0;left: 133px}
      .icon.buy:before {left: 159px;}
      .secondradio {margin-bottom: 15px;}
+     .secondradio div.typelist{width: 110px;height: 36px;line-height: 16px;box-sizing: border-box;padding: 10px 0; background-color: #ffffff;border: none;display: inline-block;cursor: pointer;position: relative;color: #627386;}
+     .secondradio .typelist .radio{width: 16px;height: 16px;background: url("/img/cart/icon_weigouxuan@2x.png") no-repeat;background-size: cover;display: block;float: left;}
+     .secondradio .typelist.checked .radio{background: url("/img/cart/icon_yixuanze@2x.png") no-repeat;background-size: cover;}
+     .secondradio .typelist .rtext{display: block;float: left;margin-left: 8px;}
      .linqi_text {width: 425px;height: 45px;background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);text-align: center;line-height: 45px;color: #ffffff;margin: auto}
      .jiaobiao {width: 0;height: 0;border-left: 10px solid transparent;border-right: 10px solid transparent;top: 74px;right: 50%;border-bottom: 10px solid #1890f9;position: absolute}
      #shoplogo {height: 36px;border-radius: 2px;padding-left: 10px;width: 508px;border: solid 1px #b8bfca;color: #9aa5b5}
@@ -47,9 +53,13 @@ body{background: #fff}
      .form-upload-tips:hover .wen-tips {display: block;}
      #word-limit {position: absolute;right: 0;bottom: 10px;font-size: 12px;color: #9aa5b5}
      .unlogin-item {margin-top: 20px;width: 100%;float: left;}
+     .getCode{box-sizing: border-box;width: 168px;height: 36px;margin-right: 15px;float: right; line-height: 34px;text-align: center;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;color: #e15616;font-size: 14px;}
+     .getCode.disabled{background-color: #D6D6D6;border-color: #D6D6D6;color: #FFFFFF;}
      .textarea-wrapper {letter-spacing: 1.5px;line-height: 24px;color: #627386;position: relative;width: 496px;}
-     .BtnAll {margin-top: 30px;width: 520px;overflow: hidden}
-     .BtnAll button {width: 232px;height: 50px;border-radius: 2px;line-height: 50px;text-align: center;font-size: 18px;cursor: pointer;}
+     .release-button {width: 100%;height: auto;float: left;margin: 50px 0;}
+     .release-button .text{width: 100%;text-align: center;margin: 15px 10px;}
+     .release-button .buttton-main{width:300px;margin: 0 auto;}
+     .release-button button {width: 300px;height: 50px;border-radius: 2px;line-height: 50px;text-align: center;font-size: 18px;cursor: pointer;}
      .Read {border: solid 1px #e15616;background-color: #ffe6dc;color: #e15616;float: left;position: relative;}
      #btn-submit {background-color: #e15616;color: #fff;float: right;}
      input[type=checkbox] {margin-right: 10px;}
@@ -136,8 +146,8 @@ body{background: #fff}
      .form-upload-tips:hover .wen-tips {display: block;}
      #word-limit {position: absolute;right: 2.7vw;bottom: 2.7vw;font-size: 3.2vw;color: #9aa5b5}
      .textarea-wrapper {letter-spacing: .4vw;line-height: 6.4vw;color: #627386;position: relative;width: 100%;font-size: 3.2vw}
-     .BtnAll {margin-top: 8vw;width: 100%;overflow: hidden}
-     .BtnAll button {width: 100%;height: 15vw;border-radius: .53vw;line-height: 15vw;text-align: center;font-size: 4.5vw;cursor: pointer;margin-bottom: 2.7vw;box-sizing: border-box;}
+     .release-button {margin-top: 8vw;width: 100%;overflow: hidden}
+     .release-button button {width: 100%;height: 15vw;border-radius: .53vw;line-height: 15vw;text-align: center;font-size: 4.5vw;cursor: pointer;margin-bottom: 2.7vw;box-sizing: border-box;}
      .Read {border: solid .27vw #e15616;background-color: #ffe6dc;color: #e15616;}
      #btn-submit {background-color: #e15616;color: #fff;}
      input[type=checkbox] {margin: 1.27vw 7px 0px -3.4vw;width: 3.5vw;height: 3.5vw;line-height: 3.5vw}

+ 12 - 0
src/main/resources/static/css/pay/caimei-paycash.css

@@ -100,6 +100,18 @@ input::-webkit-outer-spin-button {
     .pay-alert-content .pay-alert .content p{text-align: left;font-size: 14px;color: #666666;font-weight: normal;}
     .pay-alert-content .pay-alert .button{width: 100%;height: 32px;float: left;padding: 0 14px;box-sizing: border-box;}
     .pay-alert-content .pay-alert .button a{width: 90px;height: 32px;display: block;background: #E15616;border-radius: 2px;font-size: 14px;text-align: center;line-height: 32px;color: #FFFFFF;float: right;}
+    /*大额银联转账弹窗*/
+    .pay-alert-content .pay-big-alert{width: 460px;height: 386px;background: #FFFFFF;border-radius: 2px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;z-index: 9998;}
+    .pay-alert-content .pay-big-alert .title{width: 100%;height: 48px;box-sizing: border-box;font-size: 14px;line-height: 48px;text-align: left;color: #333333;float: left;position: relative;border-bottom: 1px solid #EFEFEF;background-color: #FFFFFF;padding: 0 14px;}
+    .pay-alert-content .pay-big-alert .title .icon-close{width: 16px;height: 16px;display: block;position: absolute;right:12px;top: 12px;background: url("/img/base/icon.png")-319px 0 no-repeat;cursor: pointer;}
+    .pay-alert-content .pay-big-alert .content{margin: 20px 0;width: 100%;height: auto;line-height: 24px;float: left;padding: 0 14px;box-sizing: border-box;}
+    .pay-alert-content .pay-big-alert .content p.text{text-align: left;font-size: 12px;color: #E15616;font-weight: normal;line-height: 20px;margin-bottom: 10px;}
+    .pay-alert-content .pay-big-alert .content p{text-align: left;font-size: 14px;color: #4A4F58;font-weight: bold;line-height: 34px;}
+    .pay-alert-content .pay-big-alert .content p span{font-weight: normal;}
+    .pay-alert-content .pay-big-alert .button{width: 100%;height: 32px;float: left;padding: 0 14px;box-sizing: border-box;}
+    .pay-alert-content .pay-big-alert .button a{height: 32px;padding: 0 12px;margin-left: 16px;display: block;background: #E15616;border-radius: 2px;font-size: 14px;text-align: center;line-height: 32px;color: #FFFFFF;float: right;box-sizing: border-box;}
+    .pay-alert-content .pay-big-alert .button a.btn-close{border: 1px solid #B8BFCA;color: #4A4F58;background-color: #FFFFFF;}
+
     .payment-transfer{width: 100%;height: auto;padding: 0 24px;}
     .payment-transfer .payment-transfer-main{width: 100%;height: auto;}
     .payment-transfer .payment-transfer-main .label{width: 100%;height: 38px;line-height: 38px;font-size: 13px;color: #333;}

BIN
src/main/resources/static/img/pay/iconbank-bigbank@2x.png


+ 12 - 0
src/main/resources/static/js/common/serviceapi/pay.service.js

@@ -40,6 +40,18 @@ var PayApi = {
                 callback(res);
             });
         },
+        PayOrderTransferUnion: function (params, callback) {// 正常订单大额银联转账
+            Http.AjaxService({
+                url:'/order/pay/transfer/union',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
         PayOrderPcMallAlipay: function (params, callback) {// 正常订单支付宝支付
             Http.AjaxService({
                 url:'/order/pay/alipay',

+ 1 - 1
src/main/resources/static/js/common/serviceapi/user.service.js

@@ -68,7 +68,7 @@ var UserApi = {
         * @params
         * isCheckCaptcha        是否检查图片验证码,0:检查,1:不检查
         * imgCode               图片验证码
-        * activateCodeType      1:找回密码,2:注册机构,3:供应商注册,4:更换联系人手机号-旧手机验证码,5:更换联系人手机号-新手机验证码
+        * activateCodeType      1:找回密码,2:注册机构,3:供应商注册,4:更换联系人手机号-旧手机验证码,5:更换联系人手机号-新手机验证码 6:二手发布
         * platformType          0:www,1:crm/h5,2:小程序
         * token                 图片token
         * */

+ 193 - 49
src/main/resources/static/js/flea-market/form.js

@@ -3,18 +3,31 @@ var fleaMarketForm = new Vue({
     el:'#fleaMarketForm',
     data:{
         fenlei:[
-            {name:'二手仪器',value:'1'},
-            // {name:'临期产品',value:'2'},
-            {name:'其他',value:'3'},
+            {name:'二手仪器',value:1},
+            // {name:'临期产品',value:2},
+            {name:'其他',value:3},
         ],
-        currentId:0,
         radioList:[
-            {name:'美容仪器',value:'1',isChecked:false}
+            {name:'美容仪器',value:1,isChecked:true}
+        ],
+        publisherActions:[
+            {name:'个人身份',value:1,isChecked:false},
+            {name:'公司身份',value:2,isChecked:false}
         ],
         beauty:[
-           {name:'医美',value:'1'},
-           {name:'非医美',value:'2'},
+           {name:'医美',value:1},
+           {name:'非医美',value:2},
         ],
+        productFileTypeActions:[
+            { name:'仪器原始合同',value:1,isChecked:false},
+            { name:'仪器注册证',value:2,isChecked:false},
+            { name:'仪器发票',value:3,isChecked:false},
+            { name:'仪器报关单',value:4,isChecked:false},
+            { name:'无任何文件',value:5,isChecked:false}
+        ],
+        checkedFileTypeList:[],
+        currentId:0,
+        handleCurrent:1,
         BrandList:[],
         isShow:false,
         includedTax:'',
@@ -25,8 +38,9 @@ var fleaMarketForm = new Vue({
         fromMessage:'',//提示文字
         formData:new FormData(),
         secondParams:{
+            publishIdentity:1, // 发布者身份 1.个人身份 2.公司身份
             secondHandType:'',//一级分类
-            instrumentType:'',//二手仪器分类
+            instrumentType:1,//二手仪器分类
             name:'',
             brandId:'',//品牌ID
             brandName:'',//其他品牌
@@ -39,8 +53,10 @@ var fleaMarketForm = new Vue({
             // originalPrice:'',//采购价
             // stock:'',//数量
             productQuality:'',//商品成色
+            fileType:'', // 商品包含文件类型
             contactName:'',//联系人
             contactMobile:'',//联系方式
+            checkCode:'', // 联系人手机验证码
             secondProductType:'',//
             townId:'',//县区地址
             address:'',//详细地址
@@ -49,7 +65,9 @@ var fleaMarketForm = new Vue({
             source:1,
             dockingPeopleMobile:'',
             dockingPeopleName:'',
-            authenticationImage:'',//身份证照片
+            authenticationImage:'',//身份证正面照片
+            authenticationBackImage:'',//身份证反面照片
+            licenseImage:'',//营业执照照片
             commitmentImage:'',//承诺函图片
             fileName:'',//文件名称
             ossName:'',//文件OSS名称
@@ -71,6 +89,7 @@ var fleaMarketForm = new Vue({
         playid:'',
         checkVal:[],
         resultBj:false,
+        vShow_PublishIdentity:false,
         vShow_detailTalkFlag:false,
         vShow_secondHandType:false,
         vShow_instrumentType:false,
@@ -80,6 +99,8 @@ var fleaMarketForm = new Vue({
         vShow_shopColor:false,
         vShow_contactName:false,
         vShow_contactMobile:false,
+        vShow_fileType:false,
+        vShow_checkCode:false,
         vShow_caimeiMobile:false,
         vShow_Address:false,
         vShow_TownId:false,
@@ -96,12 +117,21 @@ var fleaMarketForm = new Vue({
         cancelButtonText:'取消发布',
         confirmButtonText:'去支付',
         isButtonsType:0,
+        mobilCount:0,
+        mobileCodeText:'获取验证码',
+        mobilTime:null,
+        isMobileDisabled:true,
     },
     methods:{
         showBrand:function(){
             var _this = this;
             _this.selectBrand = !_this.selectBrand;
         },
+        hadldPublishIdentity: function(item) {
+        var _this = this;
+            _this.handleCurrent = item.value;
+            _this.secondParams.publishIdentity = item.value;
+        },
         secondHandRidio: function(item) {
         var _this = this;
             _this.currentId = item.value;
@@ -163,7 +193,23 @@ var fleaMarketForm = new Vue({
                 event.target.value = '';
             });
         },
-        uploadAuthenticationImagesFn: function(event){//上传身份验证照片
+        uploadLicenseImageFn: function(event){//上传营业执照照片
+            var _this = this;
+            var inputDOM = _this.$refs.LicenseImage;
+            var file = inputDOM.files[0];
+            var size = file.size;
+            if(size > 5242880){//限制了文件的大小5MB
+                CAIMEI.dialog('图片不能超过5M');
+                event.target.value = '';
+                return;
+            }
+            _this.formData.append('file', file);
+            SecondApi.uploadimg(_this.formData,function(response){
+                _this.secondParams.licenseImage = response.data;
+                event.target.value = '';
+            });
+        },
+        uploadAuthenticationImagesFn: function(event){//上传身份正面照片
             var _this = this;
             var inputDOM = _this.$refs.AuthenticationImage;
             var file = inputDOM.files[0];
@@ -179,6 +225,22 @@ var fleaMarketForm = new Vue({
                 event.target.value = '';
             });
         },
+        uploadAuthenticationBackImageFn: function(event){//上传身份反面照片
+            var _this = this;
+            var inputDOM = _this.$refs.AuthenticationBackImage;
+            var file = inputDOM.files[0];
+            var size = file.size;
+            if(size > 5242880){//限制了文件的大小5MB
+                CAIMEI.dialog('图片不能超过5M');
+                event.target.value = '';
+                return;
+            }
+            _this.formData.append('file', file);
+            SecondApi.uploadimg(_this.formData,function(response){
+                _this.secondParams.authenticationBackImage = response.data;
+                event.target.value = '';
+            });
+        },
         uploadCommitmentImagesFn: function(event){//上传承诺函图片
             var _this = this;
             var inputDOM = _this.$refs.CommitmentImage;
@@ -228,14 +290,80 @@ var fleaMarketForm = new Vue({
             _this.GoodsImagesList.splice(index,1);
             _this.secondParams.image =_this.GoodsImagesList.toString()+',';
         },
-        removeAuthenticationImagesFn:function(){//删除身份证照片
+        removeAuthenticationImagesFn:function(){//删除身份证正面照片
             var _this = this;
             _this.secondParams.authenticationImage = '';
         },
+        removeAuthenticationBackImageFn:function () {//删除身份证反面照片
+            var _this = this;
+            _this.secondParams.authenticationBackImage = '';
+        },
+        removeLicenseImageFn:function () {//删除营业执照图片
+            var _this = this;
+            _this.secondParams.licenseImage = '';
+        },
         removeCommitmentImagesFn:function(){//删除授权函文件图片
             var _this = this;
             _this.secondParams.commitmentImage = '';
         },
+        choiceProductFileType(type,index){
+            // 选择商品文件类型
+            type.isChecked = !type.isChecked
+            if (type.isChecked) {
+                if(!this.contains(this.checkedFileTypeList,type.value)){
+                    this.checkedFileTypeList.push(type.value)
+                }
+            } else {
+                this.checkedFileTypeList.splice(this.checkedFileTypeList.indexOf(type.value),1)
+            }
+            this.secondParams.fileType = this.checkedFileTypeList.join(',')
+            console.log('fileType', this.secondParams.fileType)
+        },
+        contains:function(arr, val) {// 校验
+            return arr.some(item => item === val)
+        },
+        handleMobileInput:function () {// 控制联系人手机号显示获取验证码按钮
+            var re = /^1\d{10}$/;
+            if(re.test(this.secondParams.contactMobile)){
+               this.isMobileDisabled = false
+            }
+        },
+        getNewMobileCodeFn:function(){//获取联系人手机号短信验证码
+            var _self = this;
+            var pass = verifyCheack('.massageBtn');
+            if (!pass) { return false; }
+            var params = {
+                mobile:_self.secondParams.contactMobile,
+                isCheckCaptcha:1,
+                activateCodeType:6,
+                platformType:0
+            };
+            _self.isMobileDisabled = true;
+            UserApi.getRegisterMobileCode(params,function(response){
+                if(response.code == 0){
+                    CAIMEI.dialog('验证短信已发送',false,function () {});
+                    var TIME_COUNT = 60;
+                    if (!_self.mobilTime) {
+                        _self.mobilCount = TIME_COUNT;
+                        _self.isMobileDisabled = true;
+                        _self.mobilTime = setInterval(function(){
+                            if (_self.mobilCount > 1 && _self.mobilCount <= TIME_COUNT) {
+                                _self.mobilCount--;
+                                _self.mobileCodeText = _self.mobilCount +'s重新发送';
+                            } else {
+                                _self.isMobileDisabled = false;
+                                clearInterval(_self.mobilTime);
+                                _self.mobilTime = null;
+                                _self.mobileCodeText = '获取验证码';
+                            }
+                        },1000)
+                    }
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                    _self.isMobileDisabled = false;
+                }
+            })
+        },
         deleteCommitmentFile:function(){//删除承诺函文件
             var _this = this;
             SecondApi.deleteOssFile({ ossName : _this.secondParams.ossName },function (response) {
@@ -276,128 +404,146 @@ var fleaMarketForm = new Vue({
             if(_this.secondParams.secondHandType == ''){
                 _this.vShow_secondHandType = true;
                 _this.fromMessage = '请选择分类';
-                _this.scrollIntoView();
+                _this.scrollIntoView('secondHandrelease');
                 setTimeout(function(){
                     _this.vShow_secondHandType= false;
-                },2000);
+                },3000);
                 return;
             }
             if(_this.secondParams.secondHandType == 1 ){
                if(_this.secondParams.instrumentType ==''){
                 _this.vShow_instrumentType = true;
                 _this.fromMessage = '请完善仪器分类';
-                _this.scrollIntoView();
+                _this.scrollIntoView('secondHandrelease');
                 setTimeout(function(){
                     _this.vShow_instrumentType= false;
-                },2000);
+                },3000);
                 return;
                 }
             }
-            if(_this.secondParams.brandID == ''){
+            if(_this.secondParams.brandId == ''){
                 _this.vShow_BrandID = true;
                 _this.fromMessage = '请选择商品品牌';
-                _this.scrollIntoView();
+                _this.scrollIntoView('secondHandrelease');
                 setTimeout(function(){
                     _this.vShow_BrandID = false;
-                },2000);
+                },3000);
                 return;
             }
             if(_this.secondParams.name == ''){
                 _this.vShow_Name = true;
                 _this.fromMessage = '请输入商品名称';
-                _this.scrollIntoView();
+                _this.scrollIntoView('vShowsecondHandType');
                 setTimeout(function(){
                     _this.vShow_Name = false;
-                },2000);
+                },3000);
                 return
          }
              if(_this.secondParams.price == ''){
                   _this.vShow_Price = true;
                   _this.fromMessage = '请输入交易价';
-                  _this.scrollIntoView();
+                  _this.scrollIntoView('vShow_BrandID');
                   setTimeout(function(){
                       _this.vShow_Price = false;
-                  },2000);
+                  },3000);
                     return
              }
              if(_this.secondParams.productQuality == ''){
                   _this.vShow_shopColor = true;
                   _this.fromMessage = '请输入商品成色';
-                  _this.scrollIntoView();
+                  _this.scrollIntoView('vShow_FixedYears');
                     setTimeout(function(){
                         _this.vShow_shopColor = false;
-                    },2000);
+                    },3000);
                     return
              }
-             if(_this.secondParams.contactName == ''){
+            if(_this.secondParams.fileType == ''){
+                _this.vShow_fileType = true;
+                _this.fromMessage = '选择商品文件的类型';
+                _this.scrollIntoView('vShow_FixedYears');
+                setTimeout(function(){
+                    _this.vShow_fileType = false;
+                },3000);
+                return
+            }
+            if(_this.secondParams.contactName == ''){
                   _this.vShow_contactName = true;
                   _this.fromMessage = '请输入联系人姓名';
-                  _this.scrollIntoView();
+                  _this.scrollIntoView('vShow_Price');
                   setTimeout(function(){
                       _this.vShow_contactName = false;
-                  },2000);
+                  },3000);
                   return
              }
               if(_this.secondParams.contactMobile == ''){
                   _this.vShow_contactMobile = true;
                   _this.fromMessage = '请输入联系方式';
-                  _this.scrollIntoView();
+                  _this.scrollIntoView('vShow_Price');
                   setTimeout(function(){
                       _this.vShow_contactMobile = false;
-                  },2000);
+                  },3000);
                   return
              }
              if(!re.test(_this.secondParams.contactMobile)){
                   _this.vShow_contactMobile = true;
                   _this.fromMessage = '联系方式格式不正确';
-                  _this.scrollIntoView();
+                  _this.scrollIntoView('vShow_Price');
                   setTimeout(function(){
                       _this.vShow_contactMobile = false;
-                  },2000);
+                  },3000);
                   return
               }
+             if(_this.secondParams.checkCode == ''){
+                _this.vShow_checkCode = true;
+                _this.fromMessage = '请输入短信验证码';
+                _this.scrollIntoView('vShow_Price');
+                setTimeout(function(){
+                    _this.vShow_checkCode = false;
+                },3000);
+                return
+             }
               if(_this.secondParams.dockingPeopleMobile!='' && !re.test(_this.secondParams.dockingPeopleMobile)){
                   _this.vShow_caimeiMobile = true;
                   _this.fromMessage = '联系方式格式不正确';
-                  _this.scrollIntoView();
+                  _this.scrollIntoView('vShow_checkCode');
                   setTimeout(function(){
                       _this.vShow_caimeiMobile = false;
-                  },2000);
+                  },3000);
                   return
               }
               if(_this.secondParams.townId == ''|| _this.secondParams.townId == undefined){
                   _this.vShow_TownId = true;
                   _this.fromMessage = '请完善联系地址';
-                  _this.scrollIntoView();
+                  _this.scrollIntoView('vShow_caimeiMobile');
                   setTimeout(function(){
                       _this.vShow_TownId = false;
-                  },2000);
+                  },3000);
                   return
              }
              if(_this.secondParams.address == ''){
                   _this.vShow_Address = true;
                   _this.fromMessage = '请填写详细地址';
-                  document.getElementById('Address').scrollIntoView({block: 'start', behavior: 'smooth'});
+                  _this.scrollIntoView('vShow_caimeiMobile');
                   setTimeout(function(){
                         _this.vShow_Address = false;
-                    },2000);
+                    },3000);
                     return
              }
             if(_this.GoodsImagesList ==''){
                 _this.vShow_GoodsImages = true;
                 _this.fromMessage = '请上传图片';
-                document.documentElement.scrollTop=900;
+                _this.scrollIntoView('vShow_Address');
                 setTimeout(function(){
                     _this.vShow_GoodsImages = false;
-                },2000);
+                },3000);
                 return;
             }
             if(_this.checkbox==false){
                 _this.vShow_checkBox = true;
-                _this.fromMessage='请勾选已阅读';
+                _this.fromMessage='请阅读并勾选同意';
                 setTimeout(function(){
                     _this.vShow_checkBox = false;
-                },2000);
+                },3000);
                 return
              }
             console.log(_this.secondParams);
@@ -423,12 +569,9 @@ var fleaMarketForm = new Vue({
             var _this = this;
             SecondApi.SecondHandProduct(params,function (res) {
                 if (res.code==0){
-                    _this.PopupShow = true;
-                    _this.tipsContentText = '发布二手商品,采美需要收取您每个商品100元的展示费,展示期为3个月支付完成后,商品会在1-2个工作日内进行审核,审核通过后,商品会立即上线';
-                    _this.cancelButtonText = '取消发布';
-                    _this.confirmButtonText = '去支付';
-                    _this.isButtonsType = 2;
-                    _this.playid= res.data;
+                    CAIMEI.Alert('发布成功!商品信息会在1-2个工作日内进行审核,审核通过后将立即上线到采美二手市场', '确定', true,function () {
+                        window.location.href = '/flea-market/list.html';
+                    });
                 }else{
                     CAIMEI.Alert(res.msg, '确定', false);
                     _this.secondBj = false;
@@ -440,6 +583,7 @@ var fleaMarketForm = new Vue({
             var _this = this;
             switch(_this.isButtonsType){
                 case 1:
+                    _this.PopupShow = false;
                     _this.SecondHandProduct(_this.secondParams);
                     break;
                 case 2:
@@ -463,8 +607,8 @@ var fleaMarketForm = new Vue({
             var _this = this;
             _this.PopupShow = false;
         },
-        scrollIntoView: function(){
-            document.getElementById('secondHandrelease').scrollIntoView({block: 'start', behavior: 'smooth'});
+        scrollIntoView: function(id){
+            document.getElementById(id).scrollIntoView({block: 'start', behavior: 'smooth'});
         },
         province:function () {
            var _this = this;

+ 86 - 26
src/main/resources/static/js/pay/caimei-paycash.js

@@ -35,11 +35,13 @@ var payContainer = new Vue({
         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:'',
@@ -48,7 +50,7 @@ var payContainer = new Vue({
         invoiceStatus:false,
         isReceiptStatus:false,
         onlinePay:'',
-        payStatusText:'使用微信和网银支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。',
+        payStatusText:'使用任何一种线上支付方式支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。',
         productID:'',//发布商品的ID
         is_Wechat_bowcr:false,
         comboInfo: null, //选中的svip套餐信息
@@ -108,10 +110,10 @@ var payContainer = new Vue({
                     _self.receiptStatus =  data.order.receiptStatus;
                     _self.onlinePay = data.onlinePay;
                     if(_self.receiptAmount>0){
-                        _self.payStatusText = '使用微信和网银支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。';
+                        _self.payStatusText = '使用任何一种线上支付方式支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。';
                         _self.isReceiptStatus = false;
                     }else{
-                        _self.payStatusText = '使用微信和网银支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。';
+                        _self.payStatusText = '使用任何一种线上支付方式支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。';
                         _self.isReceiptStatus = true;
                     }
                     _self.isRequest = true;
@@ -280,7 +282,7 @@ var payContainer = new Vue({
                 CAIMEI.dialog('支付系统遇到点小问题,请稍后重试', false);
                 return;
             }
-            if(_self.pageType === '3'){// 移动支付优惠券
+            if(_self.pageType === '3'){// 网银支付优惠券
                 _self.PayCouponUnionPayFn();
             }else{
                 if(_self.onlinePay == 2){
@@ -305,14 +307,22 @@ var payContainer = new Vue({
                     } else if (_self.pageType === '2') { // 网银付会员
                         _self.payVipPcMallPay();
                     } else {
-                        var params = {//正常订单
-                            payAmount:Math.round(_self.payAmount*100),
-                            bankCode:_self.payInfo.payBankNum,
-                            returnUrl:'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
-                            orderId:_self.payInfo.payOrderId,
-                            userType:_self.payInfo.payUserType
-                        };
-                        _self.PayOrderPcMallPay(params,_self.payInfo.payBankNum);
+                        if(_self.mobileTabIndex === 4){
+                            var params = {
+                                payAmount:Math.round(_self.payAmount*100),
+                                orderId:_self.payInfo.payOrderId
+                            }
+                            _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);
+                        }
                     }
                 }
             }
@@ -332,6 +342,22 @@ var payContainer = new Vue({
                 }
             })
         },
+        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){// 正常订单支付宝支付
             var _self = this;
             _self.isSubMitStatus=true;
@@ -437,23 +463,39 @@ var payContainer = new Vue({
             var _self = this;
             _self.mobileTabIndex = index;
             _self.payInfo.payBankNum = bankNum;
-            if( _self.mobileTabIndex==2){
-                _self.bankTabIndex = 0
-                _self.payInfo.payType = '1';
-                _self.payInfo.payUserType = 'ENTERPRISE';
-            }else if(_self.mobileTabIndex == 3){
-                _self.bankTabIndex = 0
-                _self.payInfo.payType = '2';
-                _self.payInfo.payUserType = 'USER';
+            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;
-            if( _self.mobileTabIndex == 2 ){
-                _self.payInfo.payBankNum = item.b2B;
-            }else if( _self.mobileTabIndex ==3 ){
-                _self.payInfo.payBankNum = item.b2C;
+            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(){//复制网银支付链接
@@ -522,7 +564,6 @@ var payContainer = new Vue({
         },
         RefreshBody:function(){//刷新页面
             var _self = this;
-
             if(_self.payInfo.payBankNum == 'WEIXIN'){
                 if( _self.pageType == '2' ){ // 验证支付(支付会员)
                     PayApi.PayOrderPayVipCheck({recordId : _self.vipRecordId},function(response){
@@ -564,6 +605,22 @@ var payContainer = new Vue({
                 });
             }
         },
+        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(()=>{
+                        _self.windowLocationHref('success');
+                    },1000)
+                }else{
+                    setTimeout(()=>{
+                        _self.windowLocationHref('error');
+                    },1000)
+                }
+            });
+        },
         windowLocationHref:function(state){
             var _self = this;
             if( _self.pageType === '1'){
@@ -598,7 +655,7 @@ var payContainer = new Vue({
         layerConfirm:function(){
             var _self = this;
             CAIMEI.Alert('本次交易暂不支持线上支付,请使用线下转账方式付款。','知道了',true,function () {
-                _self.payStatusText = '使用微信和网银支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。';
+                _self.payStatusText = '使用任何一种线上支付方式支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。';
                 _self.isReceiptStatus = true;
             });
         },
@@ -781,6 +838,9 @@ var payContainer = new Vue({
                 }
             });
         },
+        closeBigAlert:function () {
+            this.isPayBigAlert = false
+        }
     },
     mounted: function () {
         var _self = this;

+ 4 - 0
src/main/resources/static/js/product/detail.js

@@ -66,6 +66,7 @@ var productDetail = new Vue({
         isShowMoreButton:false,
         totalPrice:0,  // 勾选配套商品总价格
         totalNumber:0, // 勾选配套商品总数量
+        isShowCaimeiShop:false
     },
     filters: {
         TypeFormat: function (value) {
@@ -176,6 +177,9 @@ var productDetail = new Vue({
                     _self.recommendType = product.recommendType ? product.recommendType : 0;
                     _self.archiveId = product.archiveId; // 保存资料列表id
                     _self.productDetailChose = product.productDetailChose; // 同资质机构显示商品详情
+                    if(product.shopId == 10235){
+                        _self.isShowCaimeiShop = true
+                    }
                     if (product.userLike && product.userLike == 1) {// 商品收藏
                         _self.collectionType = true
                     } else {

+ 4 - 0
src/main/resources/templates/flea-market/detail.html

@@ -123,6 +123,10 @@
                         <p v-if="detail.productType==1">医美</p>
                         <p v-else>非医美</p>
                     </div>
+                    <div class="info price" v-if="detail.publishIdentity">
+                        <span class="label">提&nbsp;&nbsp;供&nbsp;&nbsp;方:</span>
+                        <p>{{ detail.publishIdentity == 1 ? '采美二手代售' : detail.companyName }}</p>
+                    </div>
                 </div>
                 <div class="ercode" v-if="ShowImage && detail.sold == 0" ><img :class="ShowImage?'show':''" src="/img/flea-market/er.png"/></div>
             </div>

+ 322 - 204
src/main/resources/templates/flea-market/form.html

@@ -13,225 +13,341 @@
 
 <!-- 二手商品发布 -->
 <div id="fleaMarketForm" v-cloak="">
-     <div class="bannerimg"><img src="/img/flea-market/banner@2x.png" v-if="isPC"><img src="/img/flea-market/banner3.png " v-else></div>
-      <div class="my-maintenance" id="secondHandrelease">
-            <div class="mt-top"><span class="mt-title">发布信息</span></div>
-            <div class="newsTitle">
-                <p>欢迎您来到采美365网二手商品市场,您可以在这里发布二手设备、产品信息,每个商品需要收取您100元的展示费,展示期为3个月;为了完整展示您的商品,请您认真填写以下内容,谢谢合作。</p>
-            </div>
-            <div class="mt-bottom">
-                <form id="mt-form" method="post" enctype="multipart/form-data" class="login-form common-form">
-                    <div class="unlogin-label spacing" style="letter-spacing: 1px;margin-right: 0"><span class="red-color">*</span>分类:</div>
-                          <div class="secondradio" >
-                              <div v-for="(item,index) in fenlei"  v-model="secondParams.secondHandType"  @click="secondHandRidio(item)"
-                                  :class="currentId==item.value?'select active':''" class="icon mIcon ">
-                                  {{item.name}}
-                              </div>
-                              <span class="release-tips  errTips icon mIcon" v-show="vShow_secondHandType">{{fromMessage}}</span>
-                          </div>
-                          <div class="secondradio"  v-if="isShow" >
-                            <div v-for="(item ,index) in radioList" :key="index" :class="item.isChecked ? 'select active':''"
-                                    @click="secondHandType(item)" class="icon mIcon ">
-                                   {{item.name}}
-                            </div>
-                             <span class="release-tips errTips icon mIcon" v-show="vShow_instrumentType">{{fromMessage}}</span>
-                        </div>
-                        <div class="unlogin-item input-item shrink-spacing">
-                            <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品品牌:</div>
+    <div class="bannerimg"><img src="/img/flea-market/banner@2x.png" v-if="isPC"><img
+            src="/img/flea-market/banner3.png " v-else></div>
+    <div class="my-maintenance" id="secondHandrelease">
+        <div class="mt-top"><span class="mt-title">发布信息</span></div>
+        <div class="newsTitle">
+            <p>欢迎您来到采美365网二手商品市场,您可以在这里发布二手设备、产品信息,展示期为3个月为了完整展示您的商品 请您认真填写以下商品基本信息,谢谢合作。</p>
+        </div>
+        <div class="mt-bottom">
+            <form id="mt-form" method="post" enctype="multipart/form-data" class="login-form common-form">
+                <div class="unlogin-label spacing" style="letter-spacing: 1px;margin-right: 0"><span
+                        class="red-color">*</span>发布者身份:
+                </div>
+                <div class="secondradio">
+                    <div v-for="(item,index) in publisherActions"
+                         @click="hadldPublishIdentity(item)"
+                         :class="handleCurrent==item.value?'select active':''" class="icon mIcon ">
+                        {{item.name}}
+                    </div>
+                    <span class="release-tips  errTips icon mIcon"
+                          v-show="vShow_PublishIdentity">{{fromMessage}}</span>
+                </div>
+                <div class="unlogin-label spacing" style="letter-spacing: 1px;margin-right: 0"><span
+                        class="red-color">*</span>分类:
+                </div>
+                <div class="secondradio" id="vShowsecondHandType">
+                    <div v-for="(item,index) in fenlei"
+                         @click="secondHandRidio(item)"
+                         :class="currentId==item.value?'select active':''" class="icon mIcon ">
+                        {{item.name}}
+                    </div>
+                    <span class="release-tips  errTips icon mIcon" v-show="vShow_secondHandType">{{fromMessage}}</span>
+                </div>
+                <div class="secondradio" v-if="isShow">
+                    <div v-for="(item ,index) in radioList" :key="index" :class="item.isChecked ? 'select active':''"
+                         @click="secondHandType(item)" class="icon mIcon ">
+                        {{item.name}}
+                    </div>
+                    <span class="release-tips errTips icon mIcon" v-show="vShow_instrumentType">{{fromMessage}}</span>
+                </div>
+                <div class="unlogin-item input-item shrink-spacing" id="vShow_BrandID">
+                    <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品品牌:
+                    </div>
 
-                            <div class="select" @click="showBrand">
-                                <span class="placeholder" ><i class="icon brand mIcon"></i>{{ brandname }}</span>
-                                <ul v-show="selectBrand">
-                                    <li  v-for="(item,index) in BrandList"   :key="index" :value='item.id' @click="ChangeBrand(item)">{{item.name}}</li>
-                                </ul>
-                            </div>
-                            <input type="text" v-show="shoplogoTwo" v-model="secondParams.brandName" maxlength="20" id="shoplogoTwo" placeholder="请输入商品品牌">
-                             <div class="release-tips errTips icon mIcon" v-show="vShow_BrandID">{{fromMessage}}</div>
-                        </div>
-                        <div class="unlogin-item input-item shrink-spacing">
-                            <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品名称:</div>
-                            <input type="text" maxlength="40"  id="shopname"  v-model="secondParams.name" placeholder="请输入商品名称,不超过40个汉字">
-                            <div class="release-tips errTips icon mIcon" v-show="vShow_Name">{{fromMessage}}</div>
-                        </div>
-                         <div class="unlogin-item input-item shrink-spacing">
-                            <div class="unlogin-label spacing" style="letter-spacing: 1px;">出厂日期:</div>
-                            <input type="text"  v-model="secondParams.fixedYears" id="shopyear" maxlength="10" placeholder="请输入出厂日期 如:2020年06月">
-                        </div>
-                        <div class="unlogin-item input-item shrink-spacing">
-                            <div class="unlogin-label spacing" style="letter-spacing: 1px;">公司名称:</div>
-                            <input type="text"  v-model="secondParams.companyName" id="mechanismname" maxlength="30" placeholder="请输入公司名称,不超过30个汉字">
-                        </div>
-                         <div class="unlogin-item input-item shrink-spacing" >
-                            <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>交易价:</div>
-                            <input type="text" style="width: 288px;" maxlength="20" id="shopprice"   oninput="value=value.replace(/[^\d]/g, '')"
-                               v-model="secondParams.price"  placeholder="请输入交易价">
-                            <label class="xiangliao" style="color: #E15616;;margin-left: 15px;position: relative;font-size: 14px">
-                            <input type="checkbox" name="Detailed_chat" v-model="secondParams.detailTalkFlags" @click="Detailed($event)" id="Detailed"><label for="Detailed" class="transactionbox"></label>价格详聊</label>
-                            <span class="showflag" v-show="vShow_detailTalkFlag">(勾选代表同意不显示交易价)</span>
-                            <span class="release-tips errTips icon mIcon" v-show="vShow_Price">{{fromMessage}}</span>
-                        </div>
-                        <div class="unlogin-item input-item shrink-spacing">
-                            <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品成色:</div>
-                            <input type="text" maxlength="10" id="shopcolor"v-model="secondParams.productQuality"  placeholder="请输入商品成色,如“9成新”">
-                            <span class="release-tips errTips icon mIcon" v-show="vShow_shopColor">{{fromMessage}}</span>
-                        </div>
-                        <div class="unlogin-item input-item shrink-spacing">
-                            <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>联系人:</div>
-                            <input type="text" maxlength="15" v-model="secondParams.contactName" id="linkman"  placeholder="请输入联系人姓名">
-                            <span class="release-tips errTips icon mIcon" v-show="vShow_contactName">{{fromMessage}}</span>
+                    <div class="select" @click="showBrand">
+                        <span class="placeholder"><i class="icon brand mIcon"></i>{{ brandname }}</span>
+                        <ul v-show="selectBrand">
+                            <li v-for="(item,index) in BrandList" :key="index" :value='item.id'
+                                @click="ChangeBrand(item)">{{item.name}}
+                            </li>
+                        </ul>
+                    </div>
+                    <input type="text" v-show="shoplogoTwo" v-model="secondParams.brandName" maxlength="20"
+                           id="shoplogoTwo" placeholder="请输入商品品牌">
+                    <div class="release-tips errTips icon mIcon" v-show="vShow_BrandID">{{fromMessage}}</div>
+                </div>
+                <div class="unlogin-item input-item shrink-spacing" id="vShow_Name">
+                    <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品名称:
+                    </div>
+                    <input type="text" maxlength="40" id="shopname" v-model="secondParams.name"
+                           placeholder="请输入商品名称,不超过40个汉字">
+                    <div class="release-tips errTips icon mIcon" v-show="vShow_Name">{{fromMessage}}</div>
+                </div>
+                <div class="unlogin-item input-item shrink-spacing" id="vShow_FixedYears">
+                    <div class="unlogin-label spacing" style="letter-spacing: 1px;">出厂日期:</div>
+                    <input type="text" v-model="secondParams.fixedYears" id="shopyear" maxlength="10"
+                           placeholder="请输入出厂日期 如:2020年06月">
+                </div>
+                <div class="unlogin-item input-item shrink-spacing" v-if="secondParams.publishIdentity == 2">
+                    <div class="unlogin-label spacing" style="letter-spacing: 1px;">公司名称:</div>
+                    <input type="text" v-model="secondParams.companyName" id="mechanismname" maxlength="30"
+                           placeholder="请输入公司名称,不超过30个汉字">
+                </div>
+                <div class="unlogin-item input-item shrink-spacing" id="vShow_Price">
+                    <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>交易价:
+                    </div>
+                    <input type="text" style="width: 288px;" maxlength="20" id="shopprice"
+                           oninput="value=value.replace(/[^\d]/g, '')"
+                           v-model="secondParams.price" placeholder="请输入交易价">
+                    <label class="xiangliao"
+                           style="color: #E15616;;margin-left: 15px;position: relative;font-size: 14px">
+                        <input type="checkbox" name="Detailed_chat" v-model="secondParams.detailTalkFlags"
+                               @click="Detailed($event)" id="Detailed"><label for="Detailed"
+                                                                              class="transactionbox"></label>价格详聊</label>
+                    <span class="showflag" v-show="vShow_detailTalkFlag">(勾选代表同意不显示交易价)</span>
+                    <span class="release-tips errTips icon mIcon" v-show="vShow_Price">{{fromMessage}}</span>
+                </div>
+                <div class="unlogin-item input-item shrink-spacing" id="vShow_shopColor">
+                    <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品成色:
+                    </div>
+                    <input type="text" maxlength="10" id="shopcolor" v-model="secondParams.productQuality"
+                           placeholder="请输入商品成色,如“9成新”">
+                    <span class="release-tips errTips icon mIcon" v-show="vShow_shopColor">{{fromMessage}}</span>
+                </div>
+                <div class="unlogin-item input-item shrink-spacing" id="vShow_fileType">
+                    <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品包含的文件:</div>
+                    <div class="secondradio" style="margin-bottom: 0;">
+                        <div class="typelist" v-for="(type ,index) in productFileTypeActions" :key='index' value="type.value"
+                             @click="choiceProductFileType(type, index)" :class="type.isChecked ? 'checked' : ''">
+                            <span class="radio"></span>
+                            <span class="rtext"> {{type.name}}</span>
                         </div>
-                        <div class="unlogin-item input-item shrink-spacing">
-                            <div class="unlogin-label spacing"><span class="red-color">*</span>联系方式:</div>
-                            <input type="text"  v-model="secondParams.contactMobile"  oninput="value=value.replace(/[^\d]/g,'')"  id="phoneNum" maxlength="11" placeholder="请输入联系人手机号">
-                            <span class="release-tips errTips icon mIcon" v-show="vShow_contactMobile">{{fromMessage}}</span>
+                    </div>
+                    <span class="release-tips errTips icon mIcon" v-show="vShow_fileType">{{fromMessage}}</span>
+                </div>
+                <div class="unlogin-item input-item shrink-spacing" id="vShow_contactName">
+                    <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>联系人:
+                    </div>
+                    <input type="text" maxlength="15" v-model="secondParams.contactName" id="linkman"
+                           placeholder="请输入联系人姓名">
+                    <span class="release-tips errTips icon mIcon" v-show="vShow_contactName">{{fromMessage}}</span>
+                </div>
+                <div class="unlogin-item input-item shrink-spacing" id="vShow_contactMobile">
+                    <div class="unlogin-label spacing"><span class="red-color">*</span>联系方式:</div>
+                    <input type="text" v-model="secondParams.contactMobile"
+                           oninput="value=value.replace(/[^\d]/g,'')"
+                           @blur="handleMobileInput"
+                           id="phoneNum" maxlength="11" placeholder="请输入联系人手机号">
+                    <span class="release-tips errTips icon mIcon" v-show="vShow_contactMobile">{{fromMessage}}</span>
+                </div>
+                <div class="unlogin-item input-item shrink-spacing" id="vShow_checkCode">
+                    <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>验证码:
+                    </div>
+                    <input type="text" style="width: 300px;" maxlength="6" v-model="secondParams.checkCode" placeholder="请输入验证码">
+                    <a class="getCode" href="javascript:void(0);" @click="getNewMobileCodeFn" :class="[isMobileDisabled  ? 'disabled' : '']">{{ mobileCodeText }}</a>
+                    <span class="release-tips errTips icon mIcon" v-show="vShow_checkCode">{{fromMessage}}</span>
+                </div>
+                <div class="release-main-container" v-if="secondParams.publishIdentity == 1">
+                    <div class="release-from">
+                        <div class="release-label">身份验证照片:<span style="color:#ffb496">个人请上传身份证正反面照片(照片大小不超过5M)</span>
                         </div>
-                        <div class="release-main-container">
-                            <div class="release-from">
-                                <div class="release-label">身份验证照片:<span style="color:#ffb496">个人请上传身份证正面照片;机构请上传营业执照照片(照片大小不超过5M)</span></div>
-                                <div class="release-input upload image"  id="uploadAuthenticationImage">
-                                    <div class="upload-file" v-if="secondParams.authenticationImage == ''">
-                                        <i class="icon mIcon add"></i>
-                                        <p class="add-text">验证照片</p>
-                                        <input ref="AuthenticationImage" type="file" name="file" value="" class="input-file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadAuthenticationImagesFn">
-                                    </div>
-                                    <div class="upload-file" v-else>
-                                        <img :data-original='secondParams.authenticationImage'
-                                             :src="secondParams.authenticationImage"
-                                             :data-image="secondParams.authenticationImage"
-                                             class="upload-img"
-                                             alt="身份验证照片"
-                                             id="ViewerAuthenticationImage"
-                                             @click="showViewerImageFn"
-                                        >
-                                        <i class="icon mIcon del" @click="removeAuthenticationImagesFn"></i>
-                                    </div>
-                                </div>
+                        <div class="release-input upload image" id="uploadAuthenticationImage">
+                            <div class="upload-file" v-if="secondParams.authenticationImage == ''">
+                                <i class="icon mIcon add"></i>
+                                <p class="add-text">身份证正面</p>
+                                <input ref="AuthenticationImage" type="file" name="file" value="" class="input-file"
+                                       accept="image/png,image/jpeg,image/gif,image/jpg"
+                                       @change="uploadAuthenticationImagesFn">
+                            </div>
+                            <div class="upload-file" v-else>
+                                <img :data-original='secondParams.authenticationImage'
+                                     :src="secondParams.authenticationImage"
+                                     :data-image="secondParams.authenticationImage"
+                                     class="upload-img"
+                                     alt="身份验证照片"
+                                     id="ViewerAuthenticationImage"
+                                     @click="showViewerImageFn"
+                                >
+                                <i class="icon mIcon del" @click="removeAuthenticationImagesFn"></i>
                             </div>
                         </div>
-                        <div class="unlogin-item input-item shrink-spacing">
-                            <div class="unlogin-label spacing" style="letter-spacing: 1px;">采美对接人:</div>
-                            <input type="text" maxlength="15" v-model="secondParams.dockingPeopleName"  placeholder="请输入采美对接人姓名,没有可不填">
+                        <div class="release-input upload image" id="uploadAuthenticationBackImage">
+                            <div class="upload-file" v-if="secondParams.authenticationBackImage == ''">
+                                <i class="icon mIcon add"></i>
+                                <p class="add-text">身份证反面</p>
+                                <input ref="AuthenticationBackImage" type="file" name="file" value="" class="input-file"
+                                       accept="image/png,image/jpeg,image/gif,image/jpg"
+                                       @change="uploadAuthenticationBackImageFn">
+                            </div>
+                            <div class="upload-file" v-else>
+                                <img :data-original='secondParams.authenticationBackImage'
+                                     :src="secondParams.authenticationBackImage"
+                                     :data-image="secondParams.authenticationBackImage"
+                                     class="upload-img"
+                                     alt="身份验证照片"
+                                     id="ViewerAuthenticationBackImage"
+                                     @click="showViewerImageFn"
+                                >
+                                <i class="icon mIcon del" @click="removeAuthenticationBackImageFn"></i>
+                            </div>
                         </div>
-                        <div class="unlogin-item input-item shrink-spacing">
-                            <div class="unlogin-label spacing">采美对接人联系方式:</div>
-                            <input type="text"  v-model="secondParams.dockingPeopleMobile"  oninput="value=value.replace(/[^\d]/g,'')"  maxlength="11" placeholder="请输入采美对接人手机号,没有可不填">
-                            <span class="release-tips errTips icon mIcon" v-show="vShow_caimeiMobile">{{fromMessage}}</span>
+                    </div>
+                </div>
+                <div class="release-main-container" v-if="secondParams.publishIdentity == 2">
+                    <div class="release-from">
+                        <div class="release-label">营业执照照片:<span style="color:#ffb496">请上传营业执照照片(照片大小不超过5M)</span>
                         </div>
-                        <div class="unlogin-item input-item shrink-spacing">
-                            <div class="unlogin-label spacing">商品类型:</div>
-                            <div class="secondradio">
-                                <div class="buy icon mIcon" v-for="(item ,index) in beauty" :key='index' value="item.value" @click="getProductType(item.value)" :class="secondType==item.value?'select active':''">
-                                   {{item.name}}
-                                </div>
+                        <div class="release-input upload image" id="uploadLicenseImage">
+                            <div class="upload-file" v-if="secondParams.licenseImage == ''">
+                                <i class="icon mIcon add"></i>
+                                <p class="add-text">营业执照</p>
+                                <input ref="LicenseImage" type="file" name="file" value="" class="input-file"
+                                       accept="image/png,image/jpeg,image/gif,image/jpg"
+                                       @change="uploadLicenseImageFn">
+                            </div>
+                            <div class="upload-file" v-else>
+                                <img :data-original='secondParams.licenseImage'
+                                     :src="secondParams.licenseImage"
+                                     :data-image="secondParams.licenseImage"
+                                     class="upload-img"
+                                     alt="身份验证照片"
+                                     id="ViewerLicenseImage"
+                                     @click="showViewerImageFn"
+                                >
+                                <i class="icon mIcon del" @click="removeLicenseImageFn"></i>
                             </div>
                         </div>
-                        <div class="unlogin-item input-item address-item shrink-spacing" id="Address">
-                            <div class="unlogin-label spacing"><span class="red-color">*</span>联系地址:</div>
-                            <i class="province icon mIcon selected"></i>
-                        <select class="address-input reg-select province" name="provinceID" id="cProvince" @change="province" >
-                            <option value="" >请选择</option>
-                            <option v-for="(item ,index) in provinceArray" :key="index" :value='item.id' >{{item.name}}</option>
-                        </select>
-                        <i class="cCity icon mIcon selected"></i>
-                        <select class="address-input reg-select city" name="cityID" id="cCity" @change="getcity($event)" >
-                            <option value="" >请选择</option>
-                            <option v-for="(item ,index) in cityArray" :key="index" :value="item.id" >{{item.name}}</option>
-                        </select>
-                        <i class="cTown icon mIcon selected"></i>
-                        <select class="address-input reg-select town" name="townID" id="cTown" @change="getcTown($event)">
-                            <option value="" >请选择</option>
-                            <option v-for="(item ,index) in townArray" :key="index" :value="item.id"  >{{item.name}}</option>
-                        </select>
-                        <span class="release-tips errTips icon mIcon" v-show="vShow_TownId">{{fromMessage}}</span>
-                            <textarea type="text" id="addressDetails" class="border-grey address-details" v-model="secondParams.address" maxlength="50" placeholder="请填写详细地址,如街道/小区/门牌等" /></textarea>
-                           <span class="release-tips errTips icon mIcon" v-show="vShow_Address">{{fromMessage}}</span>
+                    </div>
+                </div>
+                <div class="unlogin-item input-item shrink-spacing" id="vShow_caimeiMobile">
+                    <div class="unlogin-label spacing" style="letter-spacing: 1px;">采美对接人:</div>
+                    <input type="text" maxlength="15" v-model="secondParams.dockingPeopleName"
+                           placeholder="请输入采美对接人姓名,没有可不填">
+                </div>
+                <div class="unlogin-item input-item shrink-spacing">
+                    <div class="unlogin-label spacing">采美对接人联系方式:</div>
+                    <input type="text" v-model="secondParams.dockingPeopleMobile"
+                           oninput="value=value.replace(/[^\d]/g,'')" maxlength="11" placeholder="请输入采美对接人手机号,没有可不填">
+                    <span class="release-tips errTips icon mIcon" v-show="vShow_caimeiMobile">{{fromMessage}}</span>
+                </div>
+                <div class="unlogin-item input-item shrink-spacing">
+                    <div class="unlogin-label spacing">商品类型:</div>
+                    <div class="secondradio">
+                        <div class="buy icon mIcon" v-for="(item ,index) in beauty" :key='index' value="item.value"
+                             @click="getProductType(item.value)" :class="secondType==item.value?'select active':''">
+                            {{item.name}}
                         </div>
-                        <div class="release-main-container">
-                            <div class="release-from">
-                                <div class="release-label"><span class="red-color" >*</span>商品图片:</div>
-                                <div class="release-input upload image"  id="uploadGoodsImages">
-                                    <div class="upload-file"  v-for="(item, index) in GoodsImagesList" :key="index">
-                                        <img :data-original='item'
-                                             :src="item"
-                                             :data-image="item"
-                                             alt="商品图片"
-                                             class="upload-img"
-                                             :id="'ViewerGoodsImages'+index"
-                                             @click="showViewerImageFn2(index)"
-                                        >
-                                        <i class="icon mIcon del" @click="removeGoodsImagesFn(index)"></i>
-                                    </div>
-                                    <div class="upload-file" v-show="GoodsImagesList.length<5">
-                                        <i class="icon mIcon add"></i>
-                                        <p class="add-text">商品图片</p>
-                                        <input ref="goodsImages" type="file" name="file" value="" class="input-file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadGoodsImagesFn">
-                                    </div>
-                                    <div class="form-upload-tips">
-                                        <i class="icon mIcon icon-wen"></i>
-                                        <div class="wen-tips">最多上传5张二手商品图片,请尽量全部上传,单张图片不能超过5M</div>
-                                    </div>
-                                </div>
+                    </div>
+                </div>
+                <div class="unlogin-item input-item address-item shrink-spacing" id="vShow_Address">
+                    <div class="unlogin-label spacing"><span class="red-color">*</span>联系地址:</div>
+                    <i class="province icon mIcon selected"></i>
+                    <select class="address-input reg-select province" name="provinceID" id="cProvince"
+                            @change="province">
+                        <option value="">请选择</option>
+                        <option v-for="(item ,index) in provinceArray" :key="index" :value='item.id'>{{item.name}}
+                        </option>
+                    </select>
+                    <i class="cCity icon mIcon selected"></i>
+                    <select class="address-input reg-select city" name="cityID" id="cCity" @change="getcity($event)">
+                        <option value="">请选择</option>
+                        <option v-for="(item ,index) in cityArray" :key="index" :value="item.id">{{item.name}}</option>
+                    </select>
+                    <i class="cTown icon mIcon selected"></i>
+                    <select class="address-input reg-select town" name="townID" id="cTown" @change="getcTown($event)">
+                        <option value="">请选择</option>
+                        <option v-for="(item ,index) in townArray" :key="index" :value="item.id">{{item.name}}</option>
+                    </select>
+                    <span class="release-tips errTips icon mIcon" v-show="vShow_TownId">{{fromMessage}}</span>
+                    <textarea type="text" id="addressDetails" class="border-grey address-details"
+                              v-model="secondParams.address" maxlength="50"
+                              placeholder="请填写详细地址,如街道/小区/门牌等"/></textarea>
+                    <span class="release-tips errTips icon mIcon" v-show="vShow_Address">{{fromMessage}}</span>
+                </div>
+                <div class="release-main-container">
+                    <div class="release-from">
+                        <div class="release-label"><span class="red-color">*</span>商品图片:</div>
+                        <div class="release-input upload image" id="uploadGoodsImages">
+                            <div class="upload-file" v-for="(item, index) in GoodsImagesList" :key="index">
+                                <img :data-original='item'
+                                     :src="item"
+                                     :data-image="item"
+                                     alt="商品图片"
+                                     class="upload-img"
+                                     :id="'ViewerGoodsImages'+index"
+                                     @click="showViewerImageFn2(index)"
+                                >
+                                <i class="icon mIcon del" @click="removeGoodsImagesFn(index)"></i>
                             </div>
-                            <span class="release-tips errTips icon mIcon" v-show="vShow_GoodsImages">{{fromMessage}}</span>
-                        </div>
-                         <div class="unlogin-item">
-                            <div class="unlogin-label spacing">商品详细信息:</div>
-                            <div class="textarea-wrapper">
-                                <textarea class="border-grey" maxlength="200" v-model="secondParams.productDetails"  cols="70" id="description" rows="6"  placeholder="请填写商品详细信息,对商品进行更详细的描述"></textarea>
-                                <span id="word-limit">不超过200字</span>
+                            <div class="upload-file" v-show="GoodsImagesList.length<5">
+                                <i class="icon mIcon add"></i>
+                                <p class="add-text">商品图片</p>
+                                <input ref="goodsImages" type="file" name="file" value="" class="input-file"
+                                       accept="image/png,image/jpeg,image/gif,image/jpg" @change="uploadGoodsImagesFn">
                             </div>
-                        </div>
-                        <div class="unlogin-item input-item shrink-spacing">
-                            <div class="unlogin-label spacing">二手出让承诺函文件:<span style="color:#ffb496">(仅支持pdf,大小不能超过20M)</span></div>
-                            <div class="upload-file-view">
-                                <input class="upload-file-name" type="text" v-model="secondParams.fileName" disabled="disabled">
-                                <div class="input-file-btn" v-if="secondParams.ossName == ''">
-                                    上传文件
-                                    <input class="input-file-btn"  ref="CommitmentImagefile" type="file" name="file" value="" accept="*.pdf/*.doc*/.docx"  @change="uploadCommitmentFileFn">
-                                </div>
-                                <i class="icon mIcon del file" v-else @click="deleteCommitmentFile"></i>
+                            <div class="form-upload-tips">
+                                <i class="icon mIcon icon-wen"></i>
+                                <div class="wen-tips">最多上传5张二手商品图片,请尽量全部上传,单张图片不能超过5M</div>
                             </div>
                         </div>
-                        <div class="release-main-container">
-                            <div class="release-from">
-                                <div class="release-label">二手出让承诺函图片:<span style="color:#ffb496">(若不方便上传承诺函文件,可对承诺函进行拍照或者截图,再上传图片,照片大小不超过5M)</span></div>
-                                <div class="release-input upload image"  id="uploadCommitmentImage">
-                                    <div class="upload-file" v-if="secondParams.commitmentImage == ''">
-                                        <i class="icon mIcon add"></i>
-                                        <p class="add-text">承诺函图片</p>
-                                        <input ref="CommitmentImage" type="file" name="file" value="" class="input-file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadCommitmentImagesFn">
-                                    </div>
-                                    <div class="upload-file" v-else>
-                                        <img :data-original='secondParams.commitmentImage'
-                                             :src="secondParams.commitmentImage"
-                                             :data-image="secondParams.commitmentImage"
-                                             class="upload-img"
-                                             alt="身份验证照片"
-                                             id="ViewerCommitmentImage"
-                                             @click="showViewerImageFn1"
-                                        >
-                                        <i class="icon mIcon del" @click="removeCommitmentImagesFn"></i>
-                                    </div>
-                                </div>
-                            </div>
+                    </div>
+                    <span class="release-tips errTips icon mIcon" v-show="vShow_GoodsImages">{{fromMessage}}</span>
+                </div>
+                <div class="unlogin-item">
+                    <div class="unlogin-label spacing">商品详细信息:</div>
+                    <div class="textarea-wrapper">
+                        <textarea class="border-grey" maxlength="200" v-model="secondParams.productDetails" cols="70"
+                                  id="description" rows="6" placeholder="请填写商品详细信息,对商品进行更详细的描述"></textarea>
+                        <span id="word-limit">不超过200字</span>
+                    </div>
+                </div>
+                <div class="unlogin-item input-item shrink-spacing">
+                    <div class="unlogin-label spacing">二手出让承诺函签署文件:<span style="color:#ffb496">(仅支持pdf,大小不能超过20M)</span>
+                    </div>
+                    <div class="upload-file-view">
+                        <input class="upload-file-name" type="text" v-model="secondParams.fileName" disabled="disabled">
+                        <div class="input-file-btn" v-if="secondParams.ossName == ''">
+                            上传文件
+                            <input class="input-file-btn" ref="CommitmentImagefile" type="file" name="file" value=""
+                                   accept="*.pdf/*.doc*/.docx" @change="uploadCommitmentFileFn">
                         </div>
-                        <div class="unlogin-item">
-                            <div class="unlogin-label spacing" ><span class="red-color">*</span>免责声明:</div>
-                            <div class="textarea-wrapper" style="letter-spacing: 1.5px">
-                                鉴于本网站提供的二手版块信息包括但不限于公司名称,商品的简介、性能、描述与说明,相关图片、视频等均由卖家自行提供,
-                                由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。
-                                本网站对二手版块中买卖双方的交易不提供任何形式的担保与保证,特此声明!
+                        <i class="icon mIcon del file" v-else @click="deleteCommitmentFile"></i>
+                    </div>
+                </div>
+                <div class="release-main-container">
+                    <div class="release-from">
+                        <div class="release-label">二手出让承诺函签署图片:<span style="color:#ffb496">(若不方便上传承诺函签署文件,可对已签署的承诺函进行拍照或者截图,再上传图片,照片大小不超过5M)</span>
+                        </div>
+                        <div class="release-input upload image" id="uploadCommitmentImage">
+                            <div class="upload-file" v-if="secondParams.commitmentImage == ''">
+                                <i class="icon mIcon add"></i>
+                                <p class="add-text">承诺函图片</p>
+                                <input ref="CommitmentImage" type="file" name="file" value="" class="input-file"
+                                       accept="image/png,image/jpeg,image/gif,image/jpg"
+                                       @change="uploadCommitmentImagesFn">
+                            </div>
+                            <div class="upload-file" v-else>
+                                <img :data-original='secondParams.commitmentImage'
+                                     :src="secondParams.commitmentImage"
+                                     :data-image="secondParams.commitmentImage"
+                                     class="upload-img"
+                                     alt="身份验证照片"
+                                     id="ViewerCommitmentImage"
+                                     @click="showViewerImageFn1"
+                                >
+                                <i class="icon mIcon del" @click="removeCommitmentImagesFn"></i>
                             </div>
                         </div>
-                         <div class="BtnAll" >
-                                <button type="button" class="Read" ><input type="checkbox" @click="changeBox"/>已阅读</button>
-                                <button type="button"  @click="submitBtn" id="btn-submit">发布</button>
-                          </div>
-                          <span class="release-tips errTips icon mIcon" v-show="vShow_checkBox">{{fromMessage}}</span>
-                </form>
-          </div>
-         <div class="secondBj thebj"   v-show="PopupShow" :class="PopupShow ? 'show' :'' ">
-             <div class="bjmain theresult">
+                    </div>
+                </div>
+                <div class="release-button">
+                    <div class="buttton-main">
+                        <div class="text">
+                            <input type="checkbox" @click="changeBox"/>
+                            已阅读并同意采美
+                            <span><a href="/help/1013.html" target="_blank" style="color: #1890F9;">《二手出让协议》</a></span>
+                            <span class="release-tips errTips icon mIcon" v-show="vShow_checkBox">{{fromMessage}}</span>
+                        </div>
+                        <button type="button" @click="submitBtn" id="btn-submit">发布</button>
+                    </div>
+                </div>
+            </form>
+
+        </div>
+        <div class="secondBj thebj" v-show="PopupShow" :class="PopupShow ? 'show' :'' ">
+            <div class="bjmain theresult">
                 <span class="title">提示</span>
                 <p>{{ tipsContentText }}</p>
                 <div class="paybtn">
@@ -239,7 +355,7 @@
                     <span class="thegopay gozhofubao" @click="cancelButtonFn">{{ cancelButtonText }}</span>
                 </div>
                 <div class="close closebtn" @click="closePopupShow">×</div>
-             </div>
+            </div>
         </div>
     </div>
 </div>
@@ -247,7 +363,9 @@
 <!-- 引入底部 -->
 <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/second.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript"
+        th:src="@{/js/common/serviceapi/second.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/user.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/flea-market/form.js(v=${version})}"></script>
 </body>
 </html>

+ 27 - 3
src/main/resources/templates/pay/caimei-paycash.html

@@ -91,11 +91,14 @@
                 <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>
+                    <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">
-                        <div class="payment-title" v-if="pageType !== '2' && pageType != '3'">{{payStatusText}}</div>
+                        <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 }">
@@ -113,6 +116,9 @@
                                 <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);" 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">
@@ -161,7 +167,7 @@
     </div>
     <div class="pay-button-main" v-if="tabIndex == 0">
         <div class="inner">
-            <div class="pay-button" v-if="mobileTabIndex === 2 || mobileTabIndex === 3">
+            <div class="pay-button" v-if="mobileTabIndex === 2 || mobileTabIndex === 3 || mobileTabIndex === 4">
                 <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-else>
@@ -179,6 +185,24 @@
             <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="RefreshBigBody"></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>

+ 1 - 1
src/main/resources/templates/product/detail.html

@@ -612,7 +612,7 @@
                         <div class="con" th:text="${product.shopAddress}"></div>
                     </template>
                     <div class="tit">满意度:<i th:each="i:${#numbers.sequence(1,5)}" class="icon heart"></i></div>
-                    <a th:href="@{'/supplier-'+ ${product.shopId} +'.html'}" class="btn"
+                    <a th:href="@{'/supplier-'+ ${product.shopId} +'.html'}" class="btn" v-if="!isShowCaimeiShop"
                        onclick="_czc.push(['_trackEvent','商品详情','点击','查看主页','','Um_Event_ProductShopHome'])">查看主页</a>
                 </div>
             </div>