Merge remote-tracking branch 'origin/developer' into developerB

src/main/resources/static/css/product/detail.pc.css

@@ -161,7 +161,8 @@ li{list-style:none;}
 .productInfo .tabCon td:nth-of-type(1){width:20%;color:#93979F}
 .productInfo .tabCon td:nth-of-type(2){width:80%;color:#4A4F58}
 .productInfo .comment{color:#93979F;padding:40px 0;margin-right: 30px; position: relative}
-
+.productInfo .product-qualificationImg{width: 100%;height: auto;}
+.productInfo .product-qualificationImg image{width: 100%;height: auto;display: block;}
 .wrap>.rgt{float:right;width:284px}
 .wrap>.rgt .hd{height:40px;line-height:40px;padding:0 16px;font-size:16px;color:#e15616;font-weight:bold;background:#ffe6dc}
 .shopBox{margin-bottom:16px;background:#FFF}

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

@@ -51,6 +51,7 @@ var payContainer = new Vue({
         invoiceStatus:false,
         isReceiptStatus:false,
         onlinePay:'',
+        weChatFlag: true, // 微信支付是否启用
         payStatusText:'使用任何一种线上支付方式支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。',
         productID:'',//发布商品的ID
         is_Wechat_bowcr:false,
@@ -109,6 +110,7 @@ var payContainer = new Vue({
                     _self.payAmount =  (_self.payableAmount - _self.receiptAmount).toFixed(2);
                     _self.paySuccessCounter = data.shopOrder.paySuccessCounter;
                     _self.onlinePay = data.onlinePay;
+                    _self.weChatFlag = data.weChatFlag === '1' // 微信支付
                     _self.isRequest = true;
                     _self.PayOrderOnLineSwitch();
                 }else{

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

@@ -37,6 +37,7 @@ var productDetail = new Vue({
         isNoneDisabled: false,
         isServiceInfo: false,
         isTrainingMethod: false,
+        isQualificationImg: false,
         productTypeName: "",
         beautyActFlag: '',
         trainingMethodText: '',
@@ -192,6 +193,11 @@ var productDetail = new Vue({
                     if (product.productDetail.orderInfo != '' && product.productDetail.serviceInfo != '') {
                         _self.isServiceInfo = true;
                     }
+                    if(product.qualificationImg){//商品资质
+                        _self.isQualificationImg = true
+                    }else{
+                        _self.isQualificationImg = false
+                    }
                     if (product.commodityType == 2 && product.trainingMethod) {
                         _self.isTrainingMethod = true;
                         _self.trainingMethodText = product.trainingMethod == 1 ? '线上培训' : '线下培训';

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

@@ -102,12 +102,15 @@
                                 <a v-if="!is_Wechat_bowcr" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(0,'ALIPAY')" :class="{ active: mobileTabIndex === 0 }">
                                     <img src="/img/pay/iconbank-ali@2x.png" alt="支付宝支付">
                                 </a>
-                                <a v-if="is_Wechat_bowcr && !isPC" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(1,'WEIXIN')" :class="{ active: mobileTabIndex === 1 }">
-                                    <img src="/img/pay/iconbank-wx@2x.png" alt="微信支付">
-                                </a>
-                                <a v-if="isPC" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(1,'WEIXIN')" :class="{ active: mobileTabIndex === 1 }">
-                                    <img src="/img/pay/iconbank-wx@2x.png" alt="微信支付">
-                                </a>
+                                <!-- 只有开启了微信支付才会显示 -->
+                                <template v-if="weChatFlag">
+                                    <a v-if="is_Wechat_bowcr && !isPC" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(1,'WEIXIN')" :class="{ active: mobileTabIndex === 1 }">
+                                        <img src="/img/pay/iconbank-wx@2x.png" alt="微信支付">
+                                    </a>
+                                    <a v-if="isPC" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(1,'WEIXIN')" :class="{ active: mobileTabIndex === 1 }">
+                                        <img src="/img/pay/iconbank-wx@2x.png" alt="微信支付">
+                                    </a>
+                                </template>
                                 <a href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(2,'ICBC_B2B')" :class="{ active: mobileTabIndex === 2 }">
                                     <img src="/img/pay/iconbank-B2Bbank@2x.png" alt="企业网银">
                                 </a>
@@ -150,9 +153,11 @@
             <div class="pay-button" v-if="mobileTabIndex === 0">
                 <a href="javascript:void(0);" id="payMobileSubmit" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上支付宝支付','点击','移动支付','','Um_Event_ConfirmMobilePay'])">立即支付</a>
             </div>
-            <div class="pay-button" v-if="mobileTabIndex === 1">
-                <a href="javascript:void(0);" id="payMobileSubmit1" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上微信支付','点击','移动支付','','Um_Event_ConfirmMobilePay1'])">立即支付</a>
-            </div>
+            <template v-if="weChatFlag">
+                <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>
+            </template>
             <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>

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

@@ -1,3 +1,4 @@
+
 <!DOCTYPE html>
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
@@ -457,6 +458,7 @@
                 <span :class="tabsIndex == 2 ? 'on' : ''" v-if="isServiceInfo && !isNoneDisabled" @click="detailsClicktab(2)">服务项目</span>
                 <span :class="tabsIndex == 3 ? 'on' : ''" v-if="isTrainingMethod" @click="detailsClicktab(3)">培训方案</span>
                 <span v-if="archiveId !== 0" :class="tabsIndex == 4 ? 'on' : ''" @click="detailsClicktab(4)">相关资料</span>
+                <span :class="tabsIndex == 5 ? 'on' : ''" v-if="isQualificationImg" @click="detailsClicktab(5)">商品资质</span>
                 <!--<span>评价</span>-->
             </div>
             <div class="tabCon">
@@ -583,6 +585,11 @@
                         </div>
                     </div>
                 </div>
+                <div class="item" v-if="tabsIndex == 5">
+                    <div class="product-qualificationImg">
+                        <img :src="product.qualificationImg" alt="">
+                    </div>
+                </div>
                 <!--                <div class="item">-->
                 <!--                <div style="text-align: left;margin: 10px 0">-->
                 <!--                        <span>商品评分：</span>-->
@@ -595,6 +602,7 @@
                 <!--                    </div>-->
                 <!--                    <p class="comment">该商品暂无评价!</p>-->
                 <!--                </div>-->
+
             </div>
         </div>
         <div v-if="isPC" class="rgt">