Forráskód Böngészése

Merge branch 'developerB' of http://git.caimei365.com/caimei365/caimei365-www into developerB

xiebaomin 2 éve
szülő
commit
2976e1a5e3

+ 1 - 1
src/main/java/com/caimei/www/service/page/impl/ProductServiceImpl.java

@@ -304,7 +304,7 @@ public class ProductServiceImpl implements ProductService {
             baikeProduct.setMarketTime(formatTime(marketTime));
             baikeProduct.setNmpaTime(formatTime(nmpaTime));
             if (StringUtils.isNullOrEmpty(baikeProduct.getShopLogo())) {
-                baikeProduct.setShopLogo("/img/default/suppliver.jpg");
+                baikeProduct.setShopLogo("/img/base/placeholder.png");
             }
             // 相关推荐数据
             List<BaikeProduct> recommendList;

+ 1 - 1
src/main/java/com/caimei/www/utils/ImageUtil.java

@@ -66,7 +66,7 @@ public class ImageUtil {
 		} else if (dirName.equals("club")) {
 			image = "/img/default/default_club.jpg";
 		} else if (dirName.equals("shopLogo")) {
-			image = "/img/default/suppliver.jpg";
+			image = "/img/base/placeholder.png";
 		}else if (dirName.equals("caiMeiImage")) {
 			image = "/img/default/caiMeiImage.jpg";
 		}else {

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

@@ -197,7 +197,7 @@ li{list-style:none;}
 #productRecommend li .item a:hover img{border: solid 1px #FF5B00;}
 #productRecommend li .item img{display:block;width:151px;height:151px;border:solid 1px #e2e7ef;}
 #productRecommend li .item span{max-height:44px;padding-top:4px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;}
-#productRecommend .swiper-wrapper{height:205px;overflow:hidden;background:url(/img/default/suppliver.jpg) repeat-x center;background-size:162px;}
+#productRecommend .swiper-wrapper{height:205px;overflow:hidden;background:url(/img/base/placeholder.png) repeat-x center;background-size:162px;}
 #productRecommend .swiper-pagination{width:100%;height:14px;z-index:1;text-align:center;font-size:0;}
 #productRecommend .swiper-pagination span{display:inline-block;width:14px;height:4px;border:5px solid transparent;cursor:pointer;opacity:.2;}
 #productRecommend .swiper-pagination span:before{content:"";display:inline-block;width:100%;height:4px;background:#FF5B00;border-radius:2px}

+ 36 - 28
src/main/resources/static/js/pay/caimei-hlbpay.js

@@ -50,6 +50,7 @@ var payContainer = new Vue({
         invoiceStatus:false,
         isReceiptStatus:false,
         onlinePay:'',
+        QuickPayFlag: false,//快捷支付开关
         B2BpayFlag: false,//企业网银支付开关
         is_Wechat_bowcr:false, // 是否是微信浏览器
         weChatFlag: false, // 微信支付开关
@@ -93,6 +94,9 @@ var payContainer = new Vue({
         },
         showB2BpayMode(){
             return this.B2BpayFlag || this.svipPayFlag
+        },
+        showQuickpayMode() {
+            return this.QuickPayFlag
         }
     },
     methods: {
@@ -142,8 +146,13 @@ var payContainer = new Vue({
             this.weChatFlag = range.indexOf('1') > -1
             this.aliPayFlag = range.indexOf('2') > -1
             this.B2BpayFlag = range.indexOf('4') > -1
+            this.QuickPayFlag = range.indexOf('5') > -1
             // 设置默认支付方式
-            this.mobileTabIndex = this.aliPayFlag ? 0 : this.weChatFlag ? 1 : this.B2BpayFlag ? 2 : 3
+            if(this.QuickPayFlag){
+                this.mobileTabIndex = 4
+            }else{
+                this.mobileTabIndex = this.aliPayFlag ? 0 : this.weChatFlag ? 1 : this.B2BpayFlag ? 2 : 3
+            }
         },
         getBankList () {// 获取网银支付银行列表
             const _self = this;
@@ -251,15 +260,15 @@ var payContainer = new Vue({
                     CAIMEI.dialog('网银支付的金额必须大于¥10.00');
                     return;
                 }
-                if( this.orderFlag == 1 && this.mobileTabIndex === 2){
-                    if(this.payAmount != this.payableAmount){
+                if( this.orderFlag === 1 && this.mobileTabIndex === 2){
+                    if(this.payAmount !== this.obligation){
                         CAIMEI.Alert('企业网银支付每次收取的手续费较高,建议一次性全额付款。','确定',false);
                         return;
                     }
                 }
                 if(this.pageType === '1'){// 二手
                     this.hlb_PayOrdersecondUnion();
-                } else if (_self.pageType === '2') { // 会员
+                } else if (this.pageType === '2') { // 会员
                     this.hlb_PayVipPcMallPay();
                 } else {// 正常订单
                     this.hlb_PayOrderPcMallPay();
@@ -280,34 +289,33 @@ var payContainer = new Vue({
         },
         PayCouponMiniPayFn () {  // 移动支付购买优惠券
             const _self = this;
-            if(_self.payInfo.payBankNum == "WEIXIN"){
-                _self.hlb_PayCouponMiniWxPay();
-            }else if(_self.payInfo.payBankNum == "ALIPAY"){//支付宝支付
-                _self.hlb_PayCouponAliPay();
+            if(this.payInfo.payBankNum == "WEIXIN"){
+                this.hlb_PayCouponMiniWxPay();
+            }else if(this.payInfo.payBankNum == "ALIPAY"){//支付宝支付
+                this.hlb_PayCouponAliPay();
             }
         },
         changePayAmount(event){//输入支付金额控制
-            var _self = this;
-            var value = event.target.value;
-            if(value == "" || value <0 ){//判断是否等于0 或者为空
-                _self.payAmount = '';
-                _self.payInfo.payAmount = _self.payInfo.obligation;
-                _self.balanceAmount = _self.toFixedFn(_self.payInfo.obligation);
-                return;
-            }else if(Number(value) > _self.payInfo.obligation){//判断大于应付金额
-                _self.payAmount = _self.payInfo.obligation;
-                _self.payInfo.payAmount =  _self.payAmount;
-                _self.balanceAmount = _self.toFixedFn(_self.payInfo.obligation-_self.payInfo.payAmount);
+            const _self = this;
+            const value = event.target.value;
+            if(value === "" || value <0 ){//判断是否等于0 或者为空
+                this.payAmount = '';
+                this.payInfo.payAmount = this.payInfo.obligation;
+                this.balanceAmount = this.toFixedFn(this.payInfo.obligation);
+            }else if(Number(value) > this.payInfo.obligation){//判断大于应付金额
+                this.payAmount = this.payInfo.obligation;
+                this.payInfo.payAmount =  this.payAmount;
+                this.balanceAmount = this.toFixedFn(this.payInfo.obligation-this.payInfo.payAmount);
             }else{
-                _self.payAmount = value;
-                _self.payInfo.payAmount = _self.payAmount;
-                _self.balanceAmount = _self.toFixedFn(_self.payInfo.obligation-_self.payInfo.payAmount);
+                this.payAmount = value;
+                this.payInfo.payAmount = this.payAmount;
+                this.balanceAmount = this.toFixedFn(this.payInfo.obligation-this.payInfo.payAmount);
             }
         },
         changePayAmountBlur(event){//失去焦点设置金额
             const _self = this;
-            _self.payAmount = _self.toFixedFn(event.target.value);
-            _self.payInfo.payAmount = _self.payAmount;
+            this.payAmount = this.toFixedFn(event.target.value);
+            this.payInfo.payAmount = this.payAmount;
         },
         changeTab(index,item){//选择支付方式切换
             this.tabIndex = index;
@@ -369,14 +377,14 @@ var payContainer = new Vue({
                 CAIMEI.dialog('网银支付的金额必须大于¥12.00');
                 return;
             }
-            if( _self.orderFlag == 1 && _self.mobileTabIndex === 2){
-                if(_self.payAmount != _self.payableAmount){
+            if( _self.orderFlag === 1 && _self.mobileTabIndex === 2){
+                if(_self.payAmount !== _self.payableAmount){
                     CAIMEI.Alert('企业网银支付每次收取的手续费较高,建议一次性全额付款。','确定',false);
                     return;
                 }
             }
-            var params = {};
-            if(_self.pageType == 2){
+            let params = {};
+            if(_self.pageType === 2){
                 params = {
                     unpaidAmount:_self.payAmount,
                     vipRecordId: _self.vipRecordId,

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

@@ -98,7 +98,7 @@
                 <div class="method-title">选择支付方式 <span v-if="pageType !== '2' && pageType != '3'">({{payStatusText}})</span></div>
                 <div class="method-content clear">
                     <div class="payment clear" id="mobilePayment">
-                        <div class="payment-check-bank">
+                        <div class="payment-check-bank" v-if="showQuickpayMode">
                             <a href="javascript:void(0);" class="check-bank-cell" v-for="(cards, index) in list" :key="index" :class="{ current: current === index }"  @click="handleCheckQuickCards(index,cards)">
                                 <div class="cell-icon">
                                     <i class="icon mIcon"></i>

+ 1 - 1
src/main/resources/templates/supplier/index.html

@@ -35,7 +35,7 @@
             <a class="swiper-button-next" href="javascript:void(0)"></a>
         </div>
         <div class="title">
-            <img th:src="${supplier.logo}" onerror="javascript:this.src='/img/default/suppliver.jpg';">
+            <img th:src="${supplier.logo}" onerror="javascript:this.src='/img/base/placeholder.png';">
             <h1 th:text="${supplier.name}"></h1>
             <a th:if="not${#strings.isEmpty(supplier.license)}" th:href="${supplier.license}" target="_blank"><i class="icon mIcon shop"><em class="tips">点击查看授权牌照</em></i></a>
         </div>

+ 1 - 1
src/main/resources/templates/supplier/list.html

@@ -29,7 +29,7 @@
         <li class="supplierItem clear" v-for="shop in listData"  @click="hanldHrefLink(shop)">
             <div class="left">
                 <a href="javascript:void(0);" class="logo">
-                    <img :src="shop.logo" onerror="javascript:this.src='/img/default/suppliver.jpg';">
+                    <img :src="shop.logo" onerror="javascript:this.src='/img/base/placeholder.png';">
                 </a>
                 <h5><a href="javascript:void(0);" :title="shop.name">
                     <span v-html="shop.name"></span>