浏览代码

Merge branch 'developer' into developerA

zhengjinyi 1 年之前
父节点
当前提交
fc411cd801

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

@@ -132,7 +132,7 @@ var payContainer = new Vue({
                     _self.onlinePay = data.onlinePay;
                     _self.isRequest = true;
                     // 支付方式配置
-                    _self.checkPayMode(data.onlinePayWays)
+                    _self.checkPayMode(data.onlinePayWays,data.weChatFlag)
                     _self.PayOrderOnLineSwitch();
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
@@ -140,10 +140,14 @@ var payContainer = new Vue({
             })
         },
         // 校验支付模式
-        checkPayMode(range){
+        checkPayMode(range,weChatFlag){
             // test range = '4'
             // 1微信 2支付宝 3个人网银 4企业网银
-            this.weChatFlag = range.indexOf('1') > -1
+            if(weChatFlag === '2'){
+                this.weChatFlag = false
+            }else{
+                this.weChatFlag = range.indexOf('1') > -1
+            }
             this.aliPayFlag = range.indexOf('2') > -1
             this.B2BpayFlag = range.indexOf('4') > -1
             this.QuickPayFlag = range.indexOf('5') > -1

+ 3 - 2
src/main/resources/templates/encyclopedia/detail.html

@@ -60,8 +60,9 @@
                     </div>
                 </div>
                 <div class="bk-company">
-                    <div class="bk-cover"><img src="https://picsum.photos/280/220?random=4"></div>
-                    <div class="bk-title">上海品辉医疗科技有限公司</div>
+<!--                    <div class="bk-cover"><img src="https://picsum.photos/280/220?random=4"></div>-->
+                    <div class="bk-cover"><img th:src="*{shopLogo} ? *{shopLogo} : '/img/base/placeholder.png'"></div>
+                    <div class="bk-title" th:text="*{shopName}">上海品辉医疗科技有限公司</div>
                 </div>
                 <div class="bk-directory">
                     <div class="bk-title">导航<span>></span></div>

+ 2 - 0
src/main/resources/templates/supplier_login/index.html

@@ -20,6 +20,8 @@
     <!--element ui 样式表-->
     <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
+    <!--vant 样式    -->
+    <link rel="stylesheet" href="/lib/element-ui/index.css"/>
 </head>
 
 <body>