Преглед на файлове

调整商品详情标签样式,更换线下收款银行账号

zhengjinyi преди 3 години
родител
ревизия
23055af46b

+ 3 - 3
src/main/resources/static/css/product/detail.h5.css

@@ -3,13 +3,13 @@
 * 移动端
 */
 li{list-style:none}
-.productBox{width:100%;background:#FFF}
+.productBox{width:100%;background:#FFF;position: relative;}
 .productBox .imageBox{width:100%;height:100vw;position:relative}
 #swiperImage .swiper-wrapper .swiper-slide{position:relative;zoom:1;vertical-align:middle;width:100%;overflow:hidden;text-align:center}
 #swiperImage .swiper-wrapper img{width:auto;height:100vw;display:block}
-#swiperImage .swiper-wrapper .swiper-slide .cm-product-cover-tag{position:absolute;top: 0;right: 3vw;width: 15.9vw;height: 10.5vw;background: url(/img/activity/cm_cover_bg_h5.png) no-repeat center;background-size: 15.9vw;text-align: center;color: #fff;line-height: 5.5vw;font-size: 2vw;}
+.productBox .cm-product-cover-tag{position:absolute;top: 0;right: 3vw;z-index: 99; width: 15.9vw;height: 10.5vw;background: url(/img/activity/cm_cover_bg_h5.png) no-repeat center;background-size: 15.9vw;text-align: center;color: #fff;line-height: 5.5vw;font-size: 2vw;}
 .productBox .detailBox{box-sizing:border-box;padding:0 3.3vw;overflow:hidden;position: relative;}
-.productBox .page_main_type{width: 8.8vw;height: 8.8vw;text-align: justify;box-sizing: border-box;padding: 1vw;border-radius: 0 0 2vw 2vw;background-color: #33CCBF;font-size: 2.6vw;color: #FFFFFF;line-height: 3.4vw;position: absolute;top: 0;right: 2vw;}
+.productBox .page_main_type{width: 8.8vw;height: 8.8vw;text-align: justify;box-sizing: border-box;padding: 1vw;border-radius: 0 0 2vw 2vw;background-color: #33CCBF;font-size: 2.6vw;color: #FFFFFF;line-height: 3.4vw;position: absolute;top: 0;left: 2vw;z-index: 99;}
 .productBox .detailBox .crumbs{height:8vw;line-height:8vw;font-size:3.1vw;overflow:hidden;color:#93979F}
 .productBox .detailBox .crumbs a{color:#93979F}
 .productBox .detailBox .title{width: 80vw;font-size:4.2vw;font-weight:bold;line-height:6.4vw;color:#4A4F58;margin-bottom:3.5vw;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-line-clamp: 2;line-clamp: 2;-webkit-box-orient: vertical;}

+ 2 - 2
src/main/resources/static/css/product/detail.pc.css

@@ -5,12 +5,12 @@
 li{list-style:none;}
 .productBox{width:100%;margin:16px 0;background:#FFF;box-sizing:border-box;padding:15px}
 .productBox .imageBox{float:left;width:452px;height:545px;position:relative}
-.productBox .page_main_type{width: 34px;height: 34px;text-align: justify;box-sizing: border-box;padding: 5px;border-radius: 0 0 8px 8px;background-color: #33CCBF;font-size: 12px;color: #FFFFFF;line-height: 13px;position: absolute;top: 0;right: 10px;z-index: 88;}
+.productBox .page_main_type{width: 34px;height: 34px;text-align: justify;box-sizing: border-box;padding: 5px;border-radius: 0 0 8px 8px;background-color: #33CCBF;font-size: 12px;color: #FFFFFF;line-height: 13px;position: absolute;top: 0;left: 15px;z-index: 88;}
+.productBox .cm-product-cover-tag{position:absolute;top: 0;right: 15px;z-index: 99;width: 75px;height: 49px;background: url(/img/activity/cm_cover_bg_pc.png) no-repeat center;background-size: 75px;text-align: center;color: #fff;line-height: 27px;font-size: 12px;}
 .productBox .detailBox{float:right;width:686px;position: relative;}
 .productBox img{width:100%;height:100%;display:block}
 .productBox .bigImage{position:relative; width:452px;height:452px;background:#F3F7FE;border: 1px solid #e4e4e4;}
 .productBox .bigImage .mask{display:none;position:absolute;left:0;top:0;width:215px;height:215px;border:1px solid #aaa;background:rgba(255,208,22,.4);opacity:.5;filter:alpha(opacity:50);cursor:move}
-.productBox .bigImage .cm-product-cover-tag{position:absolute;top: 0;right: 15px;width: 75px;height: 49px;background: url(/img/activity/cm_cover_bg_pc.png) no-repeat center;background-size: 75px;text-align: center;color: #fff;line-height: 27px;font-size: 12px;}
 .productBox .smallImage{height:79px;padding-top:14px;overflow:hidden}
 .productBox .smallImage ul{width:452px}
 .productBox .smallImage li{float:left;box-sizing:border-box;width:79px;height:79px;margin-left:14px;background:#F3F7FE;opacity:.5;-moz-transition:.5s;-webkit-transition:.5s;transition:.5s}

+ 3 - 3
src/main/resources/static/js/pay/caimei-paylist.js

@@ -13,7 +13,7 @@ var payContainer = new Vue({
             payMobileUrl:'',//URL
         },
         list: [],
-        showPayUnder:true,
+        showPayUnder:false,
         isRequest:false,
         orderIdentificationId:'',
         orderId:0,
@@ -53,9 +53,9 @@ var payContainer = new Vue({
                     var data = response.data; //金额初始化
                     _self.paidAmount =  (data.order.payableAmount-data.order.receiptAmount).toFixed(2);
                     if(data.discernReceipt.length>0){
-                        _self.showPayUnder = false
+                        _self.showPayUnder = true
+                        console.log(' _self.showPayUnder', _self.showPayUnder)
                     }
-
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }

+ 2 - 2
src/main/resources/templates/pay/caimei-paylist.html

@@ -87,13 +87,13 @@
                         待付金额:<span class="red">¥{{ paidAmount | NumFormat }}</span>
                     </div>
                     <div class="content-viw">
-                        开户行:<span>中信银行(深圳泰然支行)</span>
+                        开户行:<span>广发银行(深圳科苑支行)</span>
                     </div>
                     <div class="content-viw">
                         户名:<span>周仁声</span>
                     </div>
                     <div class="content-viw">
-                        银行卡号:<span>6217 6803 0362 0897</span>
+                        银行卡号:<span>6214 6202 2800 0415 461</span>
                     </div>
                     <div class="content-viw">
                         订单标识:<span v-text="orderIdentificationId"></span><span class="copy" @click="copyOrderBtnSubmitFn">复制</span>

+ 2 - 2
src/main/resources/templates/pay/caimei-payunder.html

@@ -29,13 +29,13 @@
             <div class="pay-bank">
                 <div class="pay-bank-content">
                     <div class="content-viw">
-                        开户行:<span>中信银行(深圳泰然支行)</span>
+                        开户行:<span>广发银行(深圳科苑支行)</span>
                     </div>
                     <div class="content-viw">
                         户名:<span>周仁声</span>
                     </div>
                     <div class="content-viw">
-                        银行卡号:<span>6217 6803 0362 0897</span>
+                        银行卡号:<span>6214 6202 2800 0415 461</span>
                     </div>
                     <div class="content-viw">
                         订单标识:<span v-text="orderIdentificationId"></span><span class="copy" @click="copyOrderBtnSubmitFn">复制</span>

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

@@ -23,19 +23,19 @@
     <div class="wrap">
         <div class="productBox clear">
             <div class="imageBox" id="imgShown" th:object="${product}">
+                <div class="cm-product-cover-tag"  v-if="pcActType === 1"></div>
                 <div class="page_main_type" th:if="*{productType}==2">医疗器械</div>
                 <div v-if="isPC" class="bigImage">
                     <img :src="images[0]">
                     <span class="mask"></span>
 <!--                    <span class="cm-product-cover-tag" v-if="isPC && pcActType === 1">云上美博会</span>-->
-                    <span class="cm-product-cover-tag" v-if="isPC && pcActType === 1"></span>
                 </div>
                 <div id="swiperImage" class="smallImage swiper-container">
                     <ul class="swiper-wrapper clear">
                         <li class="swiper-slide mfc" v-for="img in images">
                             <img :src="img">
 <!--                            <span class="cm-product-cover-tag" v-if="!isPC && pcActType === 1">云上美博会</span>-->
-                            <span class="cm-product-cover-tag" v-if="!isPC && pcActType === 1"></span>
+<!--                            <span class="cm-product-cover-tag" v-if="!isPC && pcActType === 1"></span>-->
                         </li>
                     </ul>
                     <div class="swiper-pagination mfc"></div>