Merge branch 'developer' into developerA

src/main/resources/static/js/article/list.js

@@ -64,7 +64,7 @@ var articleList = new Vue({
             this.loginStatus = true;
         }
         this.cmSysParams.pageType = 18;
-        this.cmSysParams.pageLabel = $('.newTitle').text();
+        this.cmSysParams.pageLabel = getUrlParam("keyword") ? getUrlParam("keyword") : $('.newTitle').text();
         this.$nextTick(function () {
             self.initQueryParam();
             self.initBase();

src/main/resources/static/js/mixins/cmSysMixins.js

@@ -19,11 +19,11 @@ var cmSysVitaMixins = function () {
                 handlearticleId:0,
                 handleProsKey:"",
                 handleShopKey:"",
-                productIds:[7247,7248],//Ross 商品ID集合
-                shopIds:[1378],// Ross 供应商Id
-                articleIds:[7184,7199,7531,7497,7471,7458,7440,7424,7398,7370,7356,7344,7300,7298,7232,6674],//Ross 相关文章ID 集合
-                keyWords:['Binary Premium','智能体疗管理系统','448k','肌肉重塑疗法','西班牙ROSS','ROSS','智能体疗','西班牙Ross','Ross','西班牙ross','ross',],// Ross 搜索商品关键词 集合
-                shopKeyWords:['深圳艾斯佰丽生物科技有限公司','艾斯佰丽'],
+                productIds:roosConfig.productIds,//Ross 商品ID集合
+                shopIds:roosConfig.shopIds,// Ross 供应商Id
+                articleIds:roosConfig.articleIds,//Ross 相关文章ID 集合
+                keyWords:roosConfig.keyWords,// Ross 搜索商品关键词 集合
+                shopKeyWords:roosConfig.shopKeyWords,// Ross 搜索供应商名称 集合
                 showRossHtml:false,
                 consultParams:{
                     ip:'',

src/main/resources/static/js/mixins/router.config.js

@@ -1,3 +1,12 @@
+//Ross 统计配置
+const  roosConfig = {
+    productIds:[7247,7248],//Ross 商品ID集合
+    shopIds:[1378],// Ross 供应商Id
+    articleIds:[7184,7199,7531,7497,7471,7458,7440,7424,7398,7370,7356,7344,7300,7298,7232,6674,7633,7618,7614,7602,7599,7593,7591,7575,7298,7215],
+    keyWords:['Binary Premium','智能体疗管理系统','448k','肌肉重塑疗法','西班牙ROSS','ROSS','智能体疗','西班牙Ross','Ross','西班牙ross','ross'],
+    shopKeyWords:['深圳艾斯佰丽生物科技有限公司','艾斯佰丽']
+}
+//统计页面
 const includeList = [
     { title:'商城首页',url:'/',pageLabel:'商城首页',pageType:1 },
     { title:'商城首页',url:'/index.html',pageLabel:'商城首页',pageType:1 },

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

@@ -6,7 +6,6 @@ var payContainer = new Vue({
     mixins: [hlbPayMixin,cmSysVitaMixins],
     data: {
         isSubMitStatus:false,
-        B2BpayFlag:1,//企业网银支付开关
         payInfo:{
             payBankNum: '', //支付类型
             shopOrderId: '',  //订单ID
@@ -52,10 +51,12 @@ var payContainer = new Vue({
         invoiceStatus:false,
         isReceiptStatus:false,
         onlinePay:'',
-        weChatFlag: true, // 微信支付是否启用
+        B2BpayFlag: false,//企业网银支付开关
+        is_Wechat_bowcr:false, // 是否是微信浏览器
+        weChatFlag: false, // 微信支付开关
+        aliPayFlag: false, // 支付宝支付开关
         payStatusText:'使用任何一种线上支付方式支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。',
         productID:'',//发布商品的ID
-        is_Wechat_bowcr:false,
         comboInfo: null, //选中的svip套餐信息
         vipRecordId: undefined,
         couponRecordId:undefined,
@@ -100,10 +101,8 @@ var payContainer = new Vue({
             var _self = this;
             PayApi.PayOrderCheckoutShoporders({shopOrderId:_self.payInfo.shopOrderId},function(response){
                 if(response.code == 0){
-                    // console.log(response);
+                    console.log(response);
                     var data = response.data; //金额初始化
-                    _self.B2BpayFlag = data.B2BpayFlag;
-                    console.log('B2BpayFlag',_self.B2BpayFlag);
                     _self.payInfo.payAmount = (data.shopOrder.realPay - data.shopOrder.receiptAmount).toFixed(2);
                     _self.discernReceiptList = data.discernReceipt;// 支付记录
                     _self.payInfo.obligation = data.shopOrder.obligation;
@@ -115,14 +114,25 @@ 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.checkPayMode(data.onlinePayWays)
                     _self.PayOrderOnLineSwitch();
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }
             })
         },
+        // 校验支付模式
+        checkPayMode: function(range){
+            // test range = '4'
+            // 1微信 2支付宝 3个人网银 4企业网银
+            this.weChatFlag = range.indexOf('1') > -1
+            this.aliPayFlag = range.indexOf('2') > -1
+            this.B2BpayFlag = range.indexOf('4') > -1
+            // 设置默认支付方式
+            this.mobileTabIndex = this.aliPayFlag ? 0 : this.weChatFlag ? 1 : this.B2BpayFlag ? 2 : 3
+        },
         getBankList:function () {// 获取网银支付银行列表
             var _self = this;
             PayApi.PayGetBankCode({},function(response){

src/main/resources/templates/activity/beautyTopic.html

@@ -841,14 +841,15 @@
 <script charset="utf-8" type="text/javascript" src="/lib/jquery-3.6.0.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript"
-        th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
-<script charset="utf-8" src="/js/activity/beautyTopic/swiper.min.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/utils.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/lib/vue2.6.12.min.js}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/activity/beautyTopic/swiper.min.js}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/activity/beautyTopic/base.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/activity/beautyTopic/utils.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/activity/beautyTopic/layout.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/activity/beautyTopic/mixin.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/router.config.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/activity/beautyTopic.js(v=${version})}"></script>
 <script>

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

@@ -99,7 +99,7 @@
                         </template>
                         <div class="pay-bank">
                             <div class="bank-list" id="mobileContent">
-                                <a v-if="!is_Wechat_bowcr" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(0,'ALIPAY')" :class="{ active: mobileTabIndex === 0 }">
+                                <a v-if="!is_Wechat_bowcr && aliPayFlag" 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>
                                 <!-- 只有开启了微信支付才会显示 -->
@@ -111,7 +111,7 @@
                                         <img src="/img/pay/iconbank-wx@2x.png" alt="微信支付">
                                     </a>
                                 </template>
-                                <a v-if="B2BpayFlag === 1" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(2,'ICBC_B2B')" :class="{ active: mobileTabIndex === 2 }">
+                                <a v-if="B2BpayFlag" 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>
                                 <a href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(3,'ICBC_B2C')" :class="{ active: mobileTabIndex === 3 }">