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

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

@@ -10,7 +10,17 @@
     .head-wrap .text{height: 81px;float: left;margin-left: 10px;line-height: 81px;font-size: 30px;color: #333333;}
     .pay-container{opacity: 0;}
     .pay-container.active{opacity: 1;}
-    .pay-content{width: 1184px;margin: 0 auto;margin-bottom: 20px;height: 477px;padding: 50px 0;background-color: #FFFFFF;display: flex;flex-direction: column;}
+    .pay-content{width: 1184px;margin: 0 auto;margin-bottom: 20px;height: 477px;padding: 50px 300px;background-color: #FFFFFF;display: flex;flex-direction: column;box-sizing: border-box;}
+    .pay-content.union{height: 310px;padding: 70px 300px;flex-direction: row;}
+    .pay-content .success-image{flex: 3;}
+    .pay-content .success-image img{width: 170px;height: 170px;}
+    .pay-content .success-content{flex: 7;height: 170px;float: right;box-sizing: border-box;padding: 16px 24px;}
+    .pay-content .success-content .text{width: 100%;height: auto;line-height: 29px;font-size: 13px;color: #627386;text-align: justify;}
+    .pay-content .success-content .text span{color: #E15621;}
+    .pay-content .success-content .success-button{width: 100%;height: 30px;margin-top: 40px;}
+    .pay-content .success-content .success-button .btn{display: block;box-sizing: border-box;width: 88px;height: 30px;text-align: center;line-height: 30px;border-radius: 2px;float: left;margin-right: 30px;}
+    .pay-content .success-content .success-button .btn.btn-home{background: #E15621;color: #FFFFFF;}
+    .pay-content .success-content .success-button .btn.btn-link{background: #FFFFFF;color: #9AA5B5;border: 1px solid #9AA5B5;}
     .pay-content .success-icon{display: flex;justify-content: center;}
     .pay-content .success-icon .icon{width: 200px;height: 200px;background-size: contain;}
     .pay-content .success-icon .icon.icon-success{background: url("/img/pay/icon-success.png")no-repeat;}

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

@@ -95,6 +95,7 @@ var fleaMarketForm = new Vue({
         vShow_instrumentType:false,
         vShow_BrandID:false,
         vShow_Name:false,
+        vShow_companyName:false,
         vShow_Price:false,
         vShow_shopColor:false,
         vShow_contactName:false,
@@ -438,7 +439,18 @@ var fleaMarketForm = new Vue({
                     _this.vShow_Name = false;
                 },3000);
                 return
-         }
+            }
+            if(_this.secondParams.publishIdentity === 2){
+                if(_this.secondParams.companyName == ''){
+                    _this.vShow_companyName = true;
+                    _this.fromMessage = '请输入公司名称';
+                    _this.scrollIntoView('vShowsecondHandType');
+                    setTimeout(function(){
+                        _this.vShow_companyName = false;
+                    },3000);
+                    return
+                }
+            }
              if(_this.secondParams.price == ''){
                   _this.vShow_Price = true;
                   _this.fromMessage = '请输入交易价';
@@ -546,23 +558,34 @@ var fleaMarketForm = new Vue({
                 },3000);
                 return
              }
-            console.log(_this.secondParams);
-            if(_this.secondParams.authenticationImage == ''){
-                _this.PopupShow = true;
-                _this.tipsContentText = '上传身份验证照片,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。';
-                _this.cancelButtonText = '继续发布';
-                _this.confirmButtonText = '去上传';
-                _this.isButtonsType = 1;
-                return;
+            if(_this.secondParams.publishIdentity === 1){
+                if(_this.secondParams.authenticationImage == '' && _this.secondParams.authenticationBackImage == ''){
+                    _this.PopupShow = true;
+                    _this.tipsContentText = '上传身份验证照片,您的二手商品将获得更好的推荐和曝光，方便您快速卖出。';
+                    _this.cancelButtonText = '继续发布';
+                    _this.confirmButtonText = '去上传';
+                    _this.isButtonsType = 1;
+                    return;
+                }
+            }else{
+                if(_this.secondParams.licenseImage == ''){
+                    _this.PopupShow = true;
+                    _this.tipsContentText = '上传营业执照照片,您的二手商品将获得更好的推荐和曝光，方便您快速卖出。';
+                    _this.cancelButtonText = '继续发布';
+                    _this.confirmButtonText = '去上传';
+                    _this.isButtonsType = 1;
+                    return;
+                }
             }
             if(_this.secondParams.commitmentImage == '' || _this.secondParams.ossName == ''){
                 _this.PopupShow = true;
-                _this.tipsContentText = '上传二手出让承诺函,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。';
+                _this.tipsContentText = '上传二手出让承诺函,您的二手商品将获得更好的推荐和曝光，方便您快速卖出。';
                 _this.cancelButtonText = '继续发布';
                 _this.confirmButtonText = '去上传';
                 _this.isButtonsType = 1;
                 return;
             }
+            console.log(_this.secondParams);
             _this.SecondHandProduct(_this.secondParams)
         },
         SecondHandProduct:function(params){//提交发布

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

@@ -292,8 +292,8 @@ var payContainer = new Vue({
                         CAIMEI.dialog('请选择银行！');
                         return;
                     }
-                    if(_self.payAmount <= 10){
-                        CAIMEI.dialog('网银支付的金额必须大于￥10.00');
+                    if(_self.payAmount <= 12){
+                        CAIMEI.dialog('网银支付的金额必须大于￥12.00');
                         return;
                     }
                     if(_self.pageType === '1'){
@@ -516,7 +516,7 @@ var payContainer = new Vue({
                     return;
                 }
                 if(_self.payAmount <= 10){
-                    CAIMEI.dialog('网银支付的金额必须大于￥10.00');
+                    CAIMEI.dialog('网银支付的金额必须大于￥12.00');
                     return;
                 }
 
@@ -612,11 +612,11 @@ var payContainer = new Vue({
                 var data = response.data.data;
                 if(data.status === '1'){
                     setTimeout(()=>{
-                        _self.windowLocationHref('success');
+                        window.location.href = '/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount;
                     },1000)
                 }else{
                     setTimeout(()=>{
-                        _self.windowLocationHref('error');
+                        window.location.href = '/pay/success.html?pageType=unionPay&type=error&payAmount='+_self.payAmount+'&orderId='+_self.payInfo.payOrderId;
                     },1000)
                 }
             });
@@ -641,6 +641,7 @@ var payContainer = new Vue({
                     14:'支付宝',
                     15:'微信支付',
                     16:'余额抵扣',
+                    20:'大额银联转账',
                 };
             Object.keys(stateTextObject).forEach(function(key) {
                 if(key == state){

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

@@ -5,6 +5,7 @@ var payContainer = new Vue({
     el:"#payContainer",
     data: {
         type:'',
+        orderId:0,// 订单Id
         pageType:'',//页面类型
         payAmount:0,//本次支付金额
         isRequest:false,
@@ -38,6 +39,9 @@ var payContainer = new Vue({
             }
             //处理根据类型做跳转
             switch (_self.pageType) {
+                case 'unionPay':
+                    _self.openLink = '/user/order/detail.html?orderId='+_self.orderId;
+                    break;
                 case 'www':
                     _self.linkText = '订单列表';
                     _self.openLink = '/user/order/list.html?state=0';
@@ -95,6 +99,7 @@ var payContainer = new Vue({
     },
     mounted: function () {
         var _self = this;
+        _self.orderId = CAIMEI.getUrlParam('orderId') ? CAIMEI.getUrlParam('orderId') : 0;
         _self.pageType = CAIMEI.getUrlParam('pageType');
         _self.payFlag = CAIMEI.getUrlParam('payFlag');
         _self.type = CAIMEI.getUrlParam('type');

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

@@ -181,7 +181,7 @@ var productDetail = new Vue({
                     _self.recommendType = product.recommendType ? product.recommendType : 0;
                     _self.archiveId = product.archiveId; // 保存资料列表id
                     _self.productDetailChose = product.productDetailChose; // 同资质机构显示商品详情
-                    if(product.shopId == 10235){
+                    if(product.shopId == 1161){
                         _self.isShowCaimeiShop = true
                     }
                     if (product.userLike && product.userLike == 1) {// 商品收藏

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

@@ -569,6 +569,13 @@ var shoppingCart = new Vue({
             var _self = this;
             _self.isShowPopup = false;
         },
+        hanldHrefLink:function (shopId) {
+            console.log('shopId',shopId)
+            if(shopId == 1161){
+                return;
+            }
+            window.open('/supplier-'+shopId+'.html');
+        }
     },
     created: function () {
         if(globalUserData){

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

@@ -77,6 +77,13 @@ var supplierList = new Vue({
                 }
             });
         },
+        hanldHrefLink:function (shopId) {
+            console.log('shopId',shopId)
+            if(shopId == 1161){
+                return;
+            }
+            window.open('/supplier-'+shopId+'.html');
+        }
 
     },
     created: function () {

src/main/resources/templates/flea-market/form.html

@@ -18,7 +18,7 @@
     <div class="my-maintenance" id="secondHandrelease">
         <div class="mt-top"><span class="mt-title">发布信息</span></div>
         <div class="newsTitle">
-            <p>欢迎您来到采美365网二手商品市场，您可以在这里发布二手设备、产品信息，展示期为3个月为了完整展示您的商品 请您认真填写以下商品基本信息，谢谢合作。</p>
+            <p>欢迎您来到采美365网二手商品市场，您可以在这里发布二手设备、产品信息，展示期为3个月;为了完整展示您的商品，请您认真填写以下商品基本信息，谢谢合作。</p>
         </div>
         <div class="mt-bottom">
             <form id="mt-form" method="post" enctype="multipart/form-data" class="login-form common-form">
@@ -81,9 +81,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>
+                    <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>公司名称：</div>
                     <input type="text" v-model="secondParams.companyName" id="mechanismname" maxlength="30"
                            placeholder="请输入公司名称，不超过30个汉字">
+                    <div class="release-tips errTips icon mIcon" v-show="vShow_companyName">{{fromMessage}}</div>
                 </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>交易价：

src/main/resources/templates/flea-market/intro.html

@@ -66,7 +66,7 @@
                   </div>
                   <div class="content_list">
                     <p>2.自主发布</p>
-                    <span> 卖家每上传一款商品，占据一个展示位,<span class="bluefont">平台收取每款商品100元的展示费用 ，有效期为<span style="font-size: 48px">6</span>个月</span>
+                    <span> 卖家每上传一款商品，占据一个展示位,<span class="bluefont">有效期为<span style="font-size: 48px">3</span>个月</span>
                            平台提供与该商品匹配的详情信息以及文章信息，降低买家决策成本，以促进销售。特殊政策除外（如特定免费时段）。</span>
                   </div>
                    <div class="content_list">

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

@@ -116,7 +116,7 @@
                                 <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 }">
+                                <a href="javascript:void(0);" v-if="pageType !== '1' && pageType != '2'  && pageType != '3'" class="bank-a mIcon" @click="checkMobilePay(4,'ICBC_B2C')" :class="{ active: mobileTabIndex === 4 }">
                                     <img src="/img/pay/iconbank-bigbank@2x.png" alt="大额网银转账">
                                 </a>
                             </div>
@@ -167,11 +167,20 @@
     </div>
     <div class="pay-button-main" v-if="tabIndex == 0">
         <div class="inner">
-            <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 class="pay-button" v-if="mobileTabIndex === 0">
+                <a href="javascript:void(0);" id="payMobileSubmit" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上支付宝支付','点击','移动支付','','Um_Event_ConfirmMobilePay'])">立即支付</a>
             </div>
-            <div class="pay-button" v-else>
-                <a href="javascript:void(0);" id="payMobileSubmit" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上支付','点击','移动支付','','Um_Event_ConfirmMobilePay'])">立即支付</a>
+            <div class="pay-button" v-if="mobileTabIndex === 1">
+                <a href="javascript:void(0);" id="payMobileSubmit1" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上微信支付','点击','移动支付','','Um_Event_ConfirmMobilePay1'])">立即支付</a>
+            </div>
+            <div class="pay-button" v-if="mobileTabIndex === 2">
+                <a v-show="isPC" href="javascript:void(0);" id="paySubmit" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上企业网银支付','点击','网银支付','','Um_Event_CopyUnionPay'])">立即支付</a>
+            </div>
+            <div class="pay-button" v-if="mobileTabIndex === 3">
+                <a v-show="isPC" href="javascript:void(0);" id="paySubmit1" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上个人网银支付','点击','网银支付','','Um_Event_CopyUnionPay2'])">立即支付</a>
+            </div>
+            <div class="pay-button" v-if="mobileTabIndex === 4">
+                <a v-show="isPC" href="javascript:void(0);" id="paySubmit2" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上大额银联支付','点击','网银支付','','Um_Event_CopyUnionPay3'])">立即支付</a>
             </div>
         </div>
     </div>
@@ -187,7 +196,7 @@
     </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="title"><p>大额银联转账信息</p><i class="icon-close" @click.stop="closeBigAlert"></i></div>
             <div class="content">
                 <p class="text">请使用银行手机app或者网银输入以下信息进行转账。 每次发起支付请求，收款账号都会变化，请使用最新的收款账号进行转账。</p>
                 <p>户名: <span>{{ bigPayInfo.receiveName }}</span></p>

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

@@ -18,16 +18,34 @@
     </div>
 </div>
 <div class="pay-container clearfix" id="payContainer" :class="isRequest ? 'active' : ''">
-    <div class="pay-content clearfix">
+    <template v-if="pageType === 'unionPay'">
+        <div class="pay-content union clearfix">
+            <div class="success-image">
+                <img src="/img/pay/icon-payerror@2x.png" alt="">
+            </div>
+            <div class="success-content">
+                <div class="text">
+                    大额银联转账耗时较久，大致需要 <span>5-15分钟</span> 才能到账成功。后续您可在订单详情页面查看订单的已支付金额和订单状态。
+                </div>
+                <div class="success-button">
+                    <a class="btn btn-home" href="/index.html">回首页</a>
+                    <a class="btn btn-link" :href="openLink">查看订单</a>
+                </div>
+            </div>
+        </div>
+    </template>
+    <template v-else>
+        <div class="pay-content clearfix">
             <div class="success-icon">
                 <div class="icon" :class="isSuccess ? 'icon-success' : 'icon-error'"></div>
             </div>
             <div class="success-text"><p class="tx1">{{isSuccessText}}</p></div>
             <div class="success-text"><p class="tx2">付款金额: <span>￥{{payAmount | NumFormat}}</span> </p></div>
-<!--            <div class="success-text"><p class="tx2"><span>{{maxtime}}s</span>后自动跳转到{{linkText}}<a :href="openLink">立即跳转</a></p></div>-->
+            <!--            <div class="success-text"><p class="tx2"><span>{{maxtime}}s</span>后自动跳转到{{linkText}}<a :href="openLink">立即跳转</a></p></div>-->
             <div class="success-text" v-if="refreshType"><p class="tx2">点击<a :href="openLink">立即跳转</a>到{{linkText}}<span style="margin-left: 25px;">{{maxtime}}s后自动跳转</span></p></div>
             <div class="success-text" v-else><p class="tx2">点击<a :href="openLink">立即跳转</a>到{{linkText}}</p></div>
-    </div>
+        </div>
+    </template>
 </div>
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>

src/main/resources/templates/product/detail.html

@@ -601,21 +601,23 @@
             <div class="shopBox">
                 <div class="hd">供应商信息</div>
                 <div class="bd">
-                    <a th:href="@{'/supplier-'+ ${product.shopId} +'.html'}">
+                    <a href="javascript:void(0);">
                         <div class="name"><span th:text="${product.shopTitle}"></span><i
                                 th:if="not${#strings.isEmpty(product.license)}" class="icon shop"></i></div>
                     </a>
-                    <template th:if="not${#strings.isEmpty(product.businessScope)}">
-                        <div class="tit">经营范围：</div>
-                        <div class="con" th:text="${product.businessScope}"></div>
-                    </template>
-                    <template th:if="not${#strings.isEmpty(product.shopAddress)}">
-                        <div class="tit">所在地区：</div>
-                        <div class="con" th:text="${product.shopAddress}"></div>
+                    <template v-if="!isShowCaimeiShop">
+                        <template th:if="not${#strings.isEmpty(product.businessScope)}">
+                            <div class="tit">经营范围：</div>
+                            <div class="con" th:text="${product.businessScope}"></div>
+                        </template>
+                        <template th:if="not${#strings.isEmpty(product.shopAddress)}">
+                            <div class="tit">所在地区：</div>
+                            <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"
+                           onclick="_czc.push(['_trackEvent','商品详情','点击','查看主页','','Um_Event_ProductShopHome'])">查看主页</a>
                     </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" v-if="!isShowCaimeiShop"
-                       onclick="_czc.push(['_trackEvent','商品详情','点击','查看主页','','Um_Event_ProductShopHome'])">查看主页</a>
                 </div>
             </div>
             <div class="contact">

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

@@ -49,7 +49,7 @@
                     <div class="c0" @click="ckeckSupplier(supplier)">
                         <span class="coll-checked" :class="[supplier.isChecked ? 'checked': '']"></span>
                     </div>
-                    <a  class="shop" :href="'/supplier-'+supplier.shopId+'.html'" target="_blank">
+                    <a  class="shop" href="JavaScript:void(0);" @click="hanldHrefLink(supplier.shopId)">
                         <img class="img" :src="supplier.shopLogo">
                         <span class="name" v-text="supplier.shopName"></span>
                     </a>

src/main/resources/templates/supplier/list.html

@@ -26,12 +26,12 @@
     </div>
     <!--列表-->
     <ul v-else class="supplierList">
-        <li class="supplierItem clear" v-for="shop in listData">
+        <li class="supplierItem clear" v-for="shop in listData"  @click="hanldHrefLink(shop.shopId)">
             <div class="left">
-                <a :href="'/supplier-'+shop.shopId+'.html'" target="_blank" class="logo">
+                <a href="javascript:void(0);" class="logo">
                     <img :src="shop.logo" onerror="javascript:this.src='/img/default/suppliver.jpg';">
                 </a>
-                <h5><a :href="'/supplier-'+shop.shopId+'.html'" :title="shop.name" target="_blank">
+                <h5><a href="javascript:void(0);" :title="shop.name">
                     <span v-html="shop.name"></span>
                 </a>
                 <a v-if="shop.license" :href="shop.license" target="_blank" class="icon mIcon shop"></a>
@@ -55,7 +55,7 @@
                     </template>
                     <li v-else-if="isPC" v-for="i in 3"></li>
                 </ul>
-                <a v-if="isPC" :href="'/supplier-'+shop.shopId+'.html'" target="_blank" class="four" onclick="_czc.push(['_trackEvent','搜索供应商','点击','查看主页','','Um_Event_SearchShopListHome'])">进入本店铺>>></a>
+                <a v-if="isPC && shop.shopId!=1161" href="javascript:void(0);" class="four" onclick="_czc.push(['_trackEvent','搜索供应商','点击','查看主页','','Um_Event_SearchShopListHome'])">进入本店铺>>></a>
             </div>
         </li>
     </ul>