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

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

@@ -43,17 +43,18 @@
     /*  弹窗  */
     .pay-alert-content{width: 100%;height: 100%;position: fixed;top: 0;left: 0;background: rgba(0,0,0,0.3);z-index: 9999;opacity: 0;}
     .pay-alert-content.show{opacity: 1;}
-    .pay-alert-content .pay-big-alert{width: 560px;height: 274px;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{width: 440px;height: 402px;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{width: 100%;height: 225px;line-height: 24px;float: left;padding: 16px;box-sizing: border-box;}
     .pay-alert-content .pay-big-alert .content-top{width: 100%;height: auto;float: left;}
-    .pay-alert-content .pay-big-alert .content-viw{width:50%;height: 34px;float: left;line-height: 34px;font-weight: bold;font-size: 14px;color: #22272E;text-align: left;}
+    .pay-alert-content .pay-big-alert .content-viw{width:100%;height: auto;float: left;line-height: 34px;font-weight: bold;font-size: 14px;color: #22272E;text-align: left;box-sizing: border-box;padding: 0 100px;}
+    .pay-alert-content .pay-big-alert .content-viw .wx_code{width: 132px;height: 132px;margin: 0 auto;display: block;}
     .pay-alert-content .pay-big-alert .content-viw span{font-weight: normal;}
     .pay-alert-content .pay-big-alert .content-viw span.red{color: #F94B4B;}
     .pay-alert-content .pay-big-alert .content-viw span.copy{margin-left:20px;display:inline-block;width: 56px;height: 24px;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 24px;text-align: center;font-size: 12px;color: #FFF;margin-top: 6px;cursor: pointer;}
-    .pay-alert-content .pay-big-alert .content-bot{width: 100%;height: 64px;float: left;box-sizing: border-box;background-color: #FFFAF8;padding: 10px 16px;margin-top: 20px;}
-    .pay-alert-content .pay-big-alert .content-bot p{line-height: 22px;font-size: 14px;color: #E15616;}
+    .pay-alert-content .pay-big-alert .content-bot{width: 100%;height: 64px;float: left;box-sizing: border-box;background-color: #F5F5F5;padding: 10px 16px;margin-top: 20px;}
+    .pay-alert-content .pay-big-alert .content-bot p{line-height: 22px;font-size: 14px;color: #666666;}
 
 
 }
@@ -95,18 +96,19 @@
     .pay-list-cell .list-cell-button .list-cell-msg span.red{color: #F94B4B;}
 
     /*  弹窗  */
-    .pay-alert-content{width: 100%;height: 100%;position: fixed;top: 0;left: 0;background: rgba(0,0,0,0.3);z-index: 9999;opacity: 0;}
+    .pay-alert-content{width: 100%;height: 100%;position: fixed;top: 0;left: 0;background: rgba(0,0,0,0.6);z-index: 9999;opacity: 0;}
     .pay-alert-content.show{opacity: 1;}
     .pay-alert-content .pay-big-alert{width: 74.8vw;height: 83.6vw;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: 11vw;box-sizing: border-box;font-size: 3.6vw;line-height: 11vw;text-align: left;color: #333333;float: left;position: relative;border-bottom: 1px solid #EFEFEF;background-color: #FFFFFF;padding: 0 3.4vw;}
     .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{width: 100%;height: auto;line-height: 8vw;float: left;padding: 4vw;box-sizing: border-box;}
     .pay-alert-content .pay-big-alert .content-top{width: 100%;height: auto;float: left;}
-    .pay-alert-content .pay-big-alert .content-viw{width:100%;height: 8vw;float: left;line-height: 8vw;font-weight: bold;font-size: 3.4vw;color: #22272E;text-align: left;}
+    .pay-alert-content .pay-big-alert .content-viw{width:100%;height: auto;float: left;line-height: 8vw;font-weight: bold;font-size: 3.4vw;color: #22272E;text-align: left;box-sizing: border-box;padding: 0 8.5vw;}
+    .pay-alert-content .pay-big-alert .content-viw .wx_code{width: 27.2vw;height: 27.2vw;margin: 0 auto;display: block;}
     .pay-alert-content .pay-big-alert .content-viw span{font-weight: normal;}
     .pay-alert-content .pay-big-alert .content-viw span.red{color: #F94B4B;}
     .pay-alert-content .pay-big-alert .content-viw span.copy{margin-left:4vw;display:inline-block;width: 12.4vw;height: 5.2vw;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 5.2vw;text-align: center;font-size: 3vw;color: #FFF;margin-top: 6px;cursor: pointer;}
-    .pay-alert-content .pay-big-alert .content-bot{width: 100%;height: 20vw;float: left;box-sizing: border-box;background-color: #FFFAF8;padding: 2.8vw;margin-top: 4vw;}
-    .pay-alert-content .pay-big-alert .content-bot p{line-height: 5vw;font-size: 3vw;color: #E15616;}
+    .pay-alert-content .pay-big-alert .content-bot{width: 100%;height: 16vw;float: left;box-sizing: border-box;background-color: #F5F5F5;padding: 2.8vw;margin-top: 4vw;}
+    .pay-alert-content .pay-big-alert .content-bot p{line-height: 5vw;font-size:2.8vw;color: #666666;}
 
 }

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

@@ -18,12 +18,18 @@
     .pay-amount h1{line-height: 35px;font-size: 28px;color: #FFFFFF;}
     .pay-bank{width: 100%;height: auto;margin-top: 30px;float: left;}
     .pay-bank .pay-bank-content{width: 60%;}
-    .pay-bank .content-viw{width:50%;height: 40px;float: left;line-height: 40px;font-weight: bold;font-size: 14px;color: #22272E;text-align: left;}
-    .pay-bank .content-viw span{font-weight: normal;}
-    .pay-bank .content-viw span.red{color: #F94B4B;}
-    .pay-bank .content-viw span.copy{margin-left:20px;display:inline-block;width: 56px;height: 24px;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 24px;text-align: center;font-size: 12px;color: #FFF;margin-top: 6px;cursor: pointer;}
+    .pay-bank .content-code{width: 132px;height: 132px;float: left;}
+    .pay-bank .content-code img{width: 132px;height: 132px;display: block;}
+    .pay-bank .content-viw{height: 132px;float: left;padding: 35px 0;padding-left:42px;box-sizing: border-box;}
+    .pay-bank .content-viw .content-h1{width: 100%;height: 34px;line-height: 34px;font-weight: bold;font-size: 14px;color: #22272E;text-align: left;position: relative;}
+    .pay-bank .content-viw .content-h1:before{content: '';width: 0;height: 0;border-right: 8px solid #E15616;border-top: 8px solid transparent;border-bottom: 8px solid transparent;position: absolute;left: -20px;top: 9px;}
+    .pay-bank .content-viw .content-h2{width: 100%;height: 34px;font-weight: bold;line-height: 34px;font-size: 14px;color: #22272E;text-align: left;position: relative;}
+    .pay-bank .content-viw .content-h2:before{content: '';width: 0;height: 0;border-right: 8px solid #FFE6DC;border-top: 8px solid transparent;border-bottom: 8px solid transparent;position: absolute;left: -20px;top: 9px;}
+    .pay-bank .content-viw .content-h2 span{font-weight: normal;}
+    .pay-bank .content-viw .content-h2 span.red{color: #F94B4B;}
+    .pay-bank .content-viw .content-h2 span.copy{margin-left:20px;display:inline-block;width: 56px;height: 24px;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 24px;text-align: center;font-size: 12px;color: #FFF;margin-top: 6px;cursor: pointer;}
     .pay-msg{width: 100%;height: 56px;margin-top:40px;float: left;}
-    .pay-msg p{width: 600px;height: 56px;line-height: 56px;background: #FFFAF8;font-size: 14px;color: #E15621;text-align: left;box-sizing: border-box;padding: 0 10px;}
+    .pay-msg p{width: 600px;height: 56px;line-height: 56px;background: #F5F5F5;font-size: 14px;color: #666666;text-align: left;box-sizing: border-box;padding: 0 10px;}
 
 }
 
@@ -48,12 +54,18 @@
     .pay-amount p{line-height: 10.3vw;font-size: 4vw;color: #FFFFFF;}
     .pay-amount h1{line-height: 10.3vw;font-size: 6.4vw;color: #FFFFFF;}
     .pay-bank{width: 100%;height: auto;margin-top: 6vw;float: left;padding: 0 3.2vw;box-sizing: border-box;}
-    .pay-bank .pay-bank-content{width: 60%;}
-    .pay-bank .content-viw{width:100%;height:10vw;float: left;line-height: 10vw;font-weight: bold;font-size: 14px;color: #22272E;text-align: left;}
+    .pay-bank .pay-bank-content{width: 100%;}
+    .pay-bank .content-code{width: 27.2vw;height: 27.2vw;float: left;}
+    .pay-bank .content-code img{width: 27.2vw;height: 27.2vw;display: block;}
+    .pay-bank .content-viw{width: 66vw;height: 27.2vw;float: left;padding: 6vw 0;padding-left:8vw;box-sizing: border-box;}
+    .pay-bank .content-viw .content-h1{width: 100%;height: 8vw;line-height: 8vw;font-weight: bold;font-size: 3vw;color: #22272E;text-align: left;position: relative;}
+    .pay-bank .content-viw .content-h1:before{content: '';width: 0;height: 0;border-right: 8px solid #E15616;border-top: 8px solid transparent;border-bottom: 8px solid transparent;position: absolute;left: -20px;top: 9px;}
+    .pay-bank .content-viw .content-h2{width: 100%;height: 8vw;font-weight: bold;line-height: 8vw;font-size: 3vw;color: #22272E;text-align: left;position: relative;}
+    .pay-bank .content-viw .content-h2:before{content: '';width: 0;height: 0;border-right: 8px solid #FFE6DC;border-top: 8px solid transparent;border-bottom: 8px solid transparent;position: absolute;left: -20px;top: 9px;}
     .pay-bank .content-viw span{font-weight: normal;}
     .pay-bank .content-viw span.red{color: #F94B4B;}
     .pay-bank .content-viw span.copy{margin-left:4vw;display:inline-block;width: 12.4vw;height: 5.2vw;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 5.2vw;text-align: center;font-size: 3vw;color: #FFF;margin-top: 6px;cursor: pointer;}
     .pay-msg{width: 100%;height: 15.8vw;margin-top:6vw;float: left;box-sizing: border-box;padding: 0 3.2vw;}
-    .pay-msg p{width: 100%;height: 15.8vw;line-height: 5vw;background: #FFFAF8;font-size: 14px;color: #E15621;text-align: left;box-sizing: border-box;padding:3vw;}
+    .pay-msg p{width: 100%;height: 15.8vw;line-height: 5vw;background: #F5F5F5;font-size: 14px;color: #666666;text-align: left;box-sizing: border-box;padding:3vw;}
 
 }

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

@@ -84,24 +84,18 @@
             <div class="content">
                 <div class="content-top">
                     <div class="content-viw">
-                        待付金额：<span class="red">￥{{ paidAmount | NumFormat }}</span>
-                    </div>
-                    <div class="content-viw">
-                        开户行：<span>{{ bankInfo.bankOfDeposit }}</span>
+                        <img class="wx_code" src="/img/base/Wecha.png" alt="微信客服">
                     </div>
                     <div class="content-viw">
-                        户名：<span>{{ bankInfo.bankUserName }}</span>
-                    </div>
-                    <div class="content-viw">
-                        银行卡号：<span>{{ bankInfo.bankCardNo }}</span>
+                        待付金额：<span class="red">￥{{ paidAmount | NumFormat }}</span>
                     </div>
                     <div class="content-viw">
                         订单标识：<span v-text="orderIdentificationId"></span><span class="copy" @click="copyOrderBtnSubmitFn">复制</span>
                     </div>
                 </div>
                 <div class="content-bot">
-                    <p>特别注意：</p>
-                    <p>请在转账备注中填写上述订单标识，方便采美财务人员快速审核，提高发货速度</p>
+                    <p>请用微信扫码添加采美客服，将订单标识告知客</p>
+                    <p>服，客服会为您推荐最合适的线下转账方式。</p>
                 </div>
             </div>
         </div>

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

@@ -28,22 +28,19 @@
             </div>
             <div class="pay-bank">
                 <div class="pay-bank-content">
-                    <div class="content-viw">
-                        开户行：<span>{{ bankInfo.bankOfDeposit }}</span>
-                    </div>
-                    <div class="content-viw">
-                        户名：<span>{{ bankInfo.bankUserName }}</span>
-                    </div>
-                    <div class="content-viw">
-                        银行卡号：<span>{{ bankInfo.bankCardNo }}</span>
+                    <div class="content-code">
+                        <img class="wx_code" src="/img/base/Wecha.png" alt="微信客服">
                     </div>
                     <div class="content-viw">
-                        订单标识：<span v-text="orderIdentificationId"></span><span class="copy" @click="copyOrderBtnSubmitFn">复制</span>
+                        <div class="content-h1">采美微信客服</div>
+                        <div class="content-h2">
+                            <p>订单标识：<span v-text="orderIdentificationId"></span><span class="copy" @click="copyOrderBtnSubmitFn">复制</span></p>
+                        </div>
                     </div>
                 </div>
             </div>
             <div class="pay-msg">
-                <p>特别注意：请在转账备注中填写上述订单标识，方便采美财务人员快速审核，提高发货速度</p>
+                <p>请用微信扫码添加采美客服，将订单标识告知客服，客服会为您推荐最合适的线下转账方式。</p>
             </div>
         </div>
     </div>