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

src/main/java/com/caimei/www/controller/unlimited/ArticleController.java

@@ -125,10 +125,14 @@ public class ArticleController extends BaseController {
         if (referer1 != null) {
             referer = referer1.get(0);
         }
+        String subReferer = "";
+        if (referer.length() > 200) {
+            subReferer = referer.substring(0, 190);
+        }
         source = source(referer);
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format = dateFormat.format(new Date());
-        articleService.insertRecord(ip,referer,source,format);
+        articleService.insertRecord(ip,subReferer,source,format);
         log.info("文章详情访问来源记录完成========》"+source);
         List<BaseLink> data = articleService.getArticleLabels().getData();
         List<ImageLink> Ads = articleService.getLastestInfoAds().getData();
@@ -232,7 +236,7 @@ public class ArticleController extends BaseController {
     }
 
     private String source(String link) {
-        if (link.contains("www.baidu.com")) {
+        if (link.contains("baidu.com")) {
             return "1";
         }
         if (link.contains("www.so.com")) {

src/main/java/com/caimei/www/controller/unlimited/HomeController.java

@@ -65,10 +65,14 @@ public class HomeController extends BaseController {
         if (referer1 != null) {
             referer = referer1.get(0);
         }
+        String subReferer = "";
+        if (referer.length() > 200) {
+            subReferer = referer.substring(0, 190);
+        }
         source = source(referer);
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format = dateFormat.format(new Date());
-        homeService.insertRecord(ip,referer,source,format);
+        homeService.insertRecord(ip,subReferer,source,format);
         log.info("首页访问来源记录完成========》"+source);
 		// 获取banner图
 		List<ImageLink> bannerList = homeService.getHomeBanners();
@@ -113,7 +117,7 @@ public class HomeController extends BaseController {
 
 
     private String source(String link) {
-        if (link.contains("www.baidu.com")) {
+        if (link.contains("baidu.com")) {
             return "1";
         }
         if (link.contains("www.so.com")) {

src/main/resources/mapper/ArticleMapper.xml

@@ -71,7 +71,7 @@
 		from info_ad a
 		where a.location = 2
 			and a.enabledStatus = 1
-		order by a.createDate desc
+		order by a.soft,a.createDate desc
 		limit 3
 	</select>
     <update id="clickArticleAd">

src/main/resources/static/css/help/clubinfo.css

@@ -5,7 +5,7 @@
   .club-info-logo .logo{width: 168px;height: 44px;display: block;margin: 0 auto;}
   .club-info-logo .logo img{width: 168px;height: 44px;display: block;}
   #informationPage{width: 700px;margin: 0 auto;}
-  .info-header{width: 100%;height: auto;padding: 24px;float:left;box-sizing: border-box;background-color: #FFFFFF;}
+  .info-header{width: 100%;height: auto;padding:10px 24px;float:left;box-sizing: border-box;background-color: #FFFFFF;}
   .info-header p{width: 100%;font-size: 20px;line-height:34px;font-weight: bold;color: #333333;}
   .info-header p span{font-size: 16px;color: #666666;font-weight: normal;}
   .info-content{width: 100%;height: auto;float: left;box-sizing: border-box;padding:0 30px;background-color: #FFFFFF;}

src/main/resources/static/js/help/clubinfo.js

@@ -73,7 +73,7 @@ var InformationPage = new Vue({
         userClubRecordLinkage: function () {
             var _self = this;
             UserApi.userClubRecordLinkage({clubId: _self.clubId}, function (response) {
-                if (response.code == 0) {
+                if (response.code === 0) {
                     _self.saleName = response.data.saleName;
                     _self.clubInfo = response.data.club;
                     _self.userClubChoseList()
@@ -86,7 +86,7 @@ var InformationPage = new Vue({
         userClubChoseList: function () {
             var _self = this;
             UserApi.userClubChoseList({}, function (response) {
-                if (response.code == 0) {
+                if (response.code === 0) {
                     _self.sellerList = response.data.map((el,index)=>{
                         el.isCheck = false
                         return el
@@ -99,7 +99,7 @@ var InformationPage = new Vue({
         userClubChoseSales: function () {
             var _self = this;
             UserApi.userClubChoseSales(_self.salesParams, function (response) {
-                if (response.code == 0) {
+                if (response.code === 0) {
                     CAIMEI.dialog('分配成功',true,function () {
                         _self.isShowPopup = false;
                         _self.userClubRecordLinkage();
@@ -112,7 +112,7 @@ var InformationPage = new Vue({
         userGetWechatMinLink: function () {// 获取小程序路径并跳转
             var _self = this;
             UserApi.userGetWechatMinLink(_self.linkParams, function (response) {
-                if (response.code == 0) {
+                if (response.code === 0) {
                     location.href = response.data;
                 } else {
                     console.log('分配协销异常')
@@ -124,7 +124,7 @@ var InformationPage = new Vue({
             var _self = this;
             _self.checkedIndex = idx;
             _self.sellerList.forEach((el, index) => {
-                if (_self.checkedIndex == index) {
+                if (_self.checkedIndex === index) {
                     el.isCheck = !el.isCheck;
                     _self.salesParams.spId = el.serviceProviderId;
                     console.log('分配协销ID', _self.salesParams.spId)

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

@@ -55,6 +55,7 @@ var payContainer = new Vue({
         is_Wechat_bowcr:false, // 是否是微信浏览器
         weChatFlag: false, // 微信支付开关
         aliPayFlag: false, // 支付宝支付开关
+        svipPayFlag: false, // 是否支付开通超级会员
         payStatusText:'使用任何一种线上支付方式支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。',
         productID:'',//发布商品的ID
         comboInfo: null, //选中的svip套餐信息
@@ -83,6 +84,17 @@ var payContainer = new Vue({
             }
         }
     },
+    computed: {
+        showAliPayMode(){
+            return !this.is_Wechat_bowcr && (this.aliPayFlag || this.svipPayFlag)
+        },
+        showWeChatPayMode(){
+            return this.weChatFlag || this.svipPayFlag
+        },
+        showB2BpayMode(){
+            return this.B2BpayFlag || this.svipPayFlag
+        }
+    },
     methods: {
         initCouponDetail:function (couponId) {//初始化优惠券数据
             var _self = this;
@@ -477,6 +489,7 @@ var payContainer = new Vue({
             this.payStatusText = '';
             this.orderFlag = 0;
         } else if (this.pageType === '2') { // 支付会员
+            this.svipPayFlag = true;
             this.orderFlag = 0;
             this.vipRecordId = parseInt(CAIMEI.getUrlParam('vipRecordId'));
             this.PayOrderOnLineSwitch();

src/main/resources/static/js/product/detail.js

@@ -625,7 +625,9 @@ var productDetail = new Vue({
                 });
             }
             // 计算价格
-            _self.calculatetTtalPrice();
+            if(this.listQuery.userId>0){
+                this.calculatetTtalPrice();
+            }
         },
         calculatetTtalPrice: function () { // 计算配套商品总价格
             var _self = this;
@@ -658,7 +660,9 @@ var productDetail = new Vue({
             }else{
                 _self.isProductChecked = false
             }
-            _self.calculatetTtalPrice();
+            if(this.listQuery.userId>0){
+                this.calculatetTtalPrice();
+            }
         },
         toBuyCoupon:function (coupon) {// 点击购买按钮事件处理
             var _self = this;

src/main/resources/static/js/product/mixins/supportMixins.js

@@ -18,6 +18,7 @@ var supportMixins = function () {
         methods: {
             handleShowPopup(pros,index){
                 this.currentIndex = index;
+                this.handldSku = pros.skus[0];
                 pros.isSkuPopup = !pros.isSkuPopup;
             },
             handleSkuCancel(pros,index){// 取消选择Sku

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/help/clubinfo.html

@@ -18,6 +18,9 @@
 </div>
 <!-- 机构信息 -->
 <div id="informationPage" v-cloak>
+  <div class="info-header clearfix" v-if="clubInfo.ipAddress">
+    <p>注册地：<span>{{ clubInfo.ipAddress }}</span></p>
+  </div>
   <div class="info-header clearfix" v-if="clubInfo.describe">
     <p>描述：<span>{{ clubInfo.describe }}</span></p>
   </div>

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

@@ -99,11 +99,11 @@
                         </template>
                         <div class="pay-bank">
                             <div class="bank-list" id="mobileContent">
-                                <a v-if="!is_Wechat_bowcr && aliPayFlag" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(0,'ALIPAY')" :class="{ active: mobileTabIndex === 0 }">
+                                <a v-if="showAliPayMode" 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>
                                 <!-- 只有开启了微信支付才会显示 -->
-                                <template v-if="weChatFlag">
+                                <template v-if="showWeChatPayMode">
                                     <a v-if="is_Wechat_bowcr && !isPC" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(1,'WEIXIN')" :class="{ active: mobileTabIndex === 1 }">
                                         <img src="/img/pay/iconbank-wx@2x.png" alt="微信支付">
                                     </a>
@@ -111,7 +111,7 @@
                                         <img src="/img/pay/iconbank-wx@2x.png" alt="微信支付">
                                     </a>
                                 </template>
-                                <a v-if="B2BpayFlag" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(2,'ICBC_B2B')" :class="{ active: mobileTabIndex === 2 }">
+                                <a v-if="showB2BpayMode" 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 }">
@@ -153,7 +153,7 @@
             <div class="pay-button" v-if="mobileTabIndex === 0">
                 <a href="javascript:void(0);" id="payMobileSubmit" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上支付宝支付','点击','移动支付','','Um_Event_ConfirmMobilePay'])">立即支付</a>
             </div>
-            <template v-if="weChatFlag">
+            <template v-if="showWeChatPayMode">
                 <div class="pay-button" v-if="mobileTabIndex === 1">
                     <a href="javascript:void(0);" id="payMobileSubmit1" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''" onclick="_czc.push(['_trackEvent','线上微信支付','点击','移动支付','','Um_Event_ConfirmMobilePay1'])">立即支付</a>
                 </div>

src/main/resources/templates/product/detail.html

@@ -473,14 +473,21 @@
                                     </span>
                                 </div>
                                 <div class="tr tr-6">
-                                    <template v-if="pros.priceFlag == 1 || (pros.priceFlag==2 && GLOBAL_USER_IDENTITY === 4) || GLOBAL_USER_IDENTITY == 3">
-                                        <div class="checked-box">
-                                           <p>不可选择</p>
-                                        </div>
+                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                        <template v-if="pros.priceFlag == 1 || (pros.priceFlag==2 && GLOBAL_USER_IDENTITY === 4) || GLOBAL_USER_IDENTITY == 3">
+                                            <div class="checked-box">
+                                                <p>不可选择</p>
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <div class="checked-box" @click="checkedSoperv(pros)">
+                                                <input class="check" type="checkbox" @change="" v-model="pros.isChecked">
+                                            </div>
+                                        </template>
                                     </template>
                                     <template v-else>
-                                        <div class="checked-box" @click="checkedSoperv(pros)">
-                                            <input class="check" type="checkbox" @change="" v-model="pros.isChecked">
+                                        <div class="checked-box">
+                                            <p>不可选择</p>
                                         </div>
                                     </template>
                                 </div>