Merge remote-tracking branch 'remotes/origin/developerA' into developerB

# Conflicts:
#	src/main/resources/config/dev/application-dev.yml
#	src/main/resources/templates/activity/beautyTopic.html

src/main/resources/static/css/activity/beautyTopic.css

@@ -312,8 +312,9 @@ a{color:#333;text-decoration:none}
 .cm-article-item .cm-line::before{content:'';display:block;height:2px;width:16px;background-color:#ff5c00}
 .cm-product-item .cm-product-title{font-size:3vw;color:#4a4f58;line-height:5vw;-webkit-transition:all 0.4s;-o-transition:all 0.4s;transition:all 0.4s}
 .cm-product-item .cm-prodcut-price{font-size:3vw;font-weight:bold}
+.cm-product-item .cm-prodcut-price .price-tag .tag{display:inline-block;height:20px;line-height:20px;border:1px solid #ffe6dc;border-radius:2px;font-size:12px;color:#e15616;cursor:pointer;background:#fff;padding:0 4px;position:relative;font-style:normal}
 .cm-product-item .h20{height:20px}
-.cm-product-item .h24{height:24px}
+.cm-product-item .h24{height:24px;line-height: 24px;}
 .cm-product-item .h44{height:10vw}
 .swiper-container{padding-bottom:8vw}
 .cm-scroll-container{overflow-x:scroll;overflow-y:hidden;white-space:nowrap}
@@ -732,3 +733,4 @@ a{color:#333;text-decoration:none}
 .cm-tabs .cm-tab{position:relative;display:inline-block;color:#4a4f58;cursor:pointer;background:#fff}
 .cm-tabs .cm-tab.on{color:#fff;background-color:#ff5c00}
 .cm-loading{z-index:99999;width:100vw;height:100vh;position:fixed;top:0;background:#fff}
+.cm-prodcut-price .red { color: #f94b4b;}

src/main/resources/static/js/activity/base.js

@@ -0,0 +1 @@
+

src/main/resources/static/js/activity/index.js

@@ -9,9 +9,9 @@ var activeApp = (function () {
             isRequest: true,
             isLoading: true,
             // showScrollTop: false,
-            activityEntryVisiable:false,
-            contactVisiable:false,
-            scrollTopSize:0,
+            activityEntryVisiable: false,
+            contactVisiable: false,
+            scrollTopSize: 0,
             msg: 'hello world',
             src: './img/test.jpg',
             // 显示个数
@@ -27,35 +27,62 @@ var activeApp = (function () {
                 userId: '',
                 source: 1
             },
-            selectVideoTabMap: {}
+            selectVideoTabMap: {},
+            //用户权限
+            globalUserData: '',
+            GLOBAL_USER_ID: 0,
+            GLOBAL_USER_IDENTITY: 0,//2-会员机构；3-供应商；4-普通机构
+            GLOBAL_SHOP_ID: 0,
         },
         mounted: function mounted() {
             this.pageLoaded();
-        },
+            this.initUserInfo()
+        }
+        ,
         created: function created() {
             this.getFloorData();
-        },
-        computed:{
-            showScrollTop: function() {
+        }
+        ,
+        computed: {
+            showScrollTop: function () {
                 return this.scrollTopSize > 600
             }
-        },
+        }
+        ,
         watch: {
             isMobile: function isMobile() {
                 // if (this.needReload) window.location.reload()
                 this.isLoading = true;
                 window.location.reload();
             }
-        },
+        }
+        ,
         filters: {
+            NumFormat: function NumFormat(value) {//处理金额
+                return Number(value).toFixed(2);
+            }
+            ,
             tabTime: function tabTime(val) {
                 // 2021-08-16 00:00:00
                 var first = val.split(' ')[0];
                 var second = first.split('-');
                 return second[1] + '-' + second[2];
             }
-        },
+        }
+        ,
         methods: {
+            //促销活动类型数据处理
+            PromotionsFormat: function (promo) {
+                if (promo !== null) {
+                    if (promo.type === 1 && promo.mode === 1) {
+                        return true;
+                    } else {
+                        return false;
+                    }
+                }
+                return false;
+            }
+            ,
             // 创建tab与轮播图的对应关系
             makeVideoFetchMap: function makeVideoFetchMap() {
                 var videoList = [22, 23, 24, 25];
@@ -66,7 +93,8 @@ var activeApp = (function () {
                     }
                 });
                 this.selectVideoTabMap = videoMap;
-            },
+            }
+            ,
 
             // tab点击事件
             handleTabClick: function handleTabClick(type, index, val) {
@@ -79,15 +107,18 @@ var activeApp = (function () {
                     utils.responsive('.aspect', 'scalc');
                     console.log('轮播图切换');
                 });
-            },
+            }
+            ,
 
             // 当前选中的轮播图
             currentVideoSwiper: function currentVideoSwiper(type, index) {
                 return this.selectVideoTabMap[type + '-' + index];
-            },
+            }
+            ,
             getFloorImageListType: function getFloorImageListType(index) {
                 return index === 0 ? 'floorImageList' : 'floorImageList' + (index + 1);
-            },
+            }
+            ,
 
             // 获取楼层信息
             getFloorData: function getFloorData() {
@@ -101,21 +132,24 @@ var activeApp = (function () {
                         that.pageInfo = res.data.page;
                         that.isRequest = false;
                         that.makeVideoFetchMap();
-                        that.activityEntryVisiable = that.initActivityEntry(res.data.page.redPacketBeginTime,res.data.page.redPacketEndTime);
+                        that.activityEntryVisiable = that.initActivityEntry(res.data.page.redPacketBeginTime, res.data.page.redPacketEndTime);
                         that.contactVisiable = res.data.page.infoBarStatus === 1;
                     }
                 })
-            },
+            }
+            ,
             // 初始化红包入口状态
-            initActivityEntry: function initActivityEntry(begin,end){
+            initActivityEntry: function initActivityEntry(begin, end) {
                 const nowTime = new Date().getTime();
                 const beginTime = new Date(begin).getTime();
                 const endTime = new Date(end).getTime();
-                return nowTime>=beginTime && nowTime<=endTime
-            },
+                return nowTime >= beginTime && nowTime <= endTime
+            }
+            ,
             fetchTemplate: function fetchTemplate(list, type) {
                 return list.indexOf(parseInt(type)) !== -1;
-            },
+            }
+            ,
 
             // 获取直播状态
             makeVideoStatus: function makeVideoStatus(floorData, index) {
@@ -134,7 +168,8 @@ var activeApp = (function () {
                 if (nowDate - oneDay > displayDate) {
                     return 2; // 已结束
                 }
-            },
+            }
+            ,
 
             // 使用产品楼层的布局
             getProductScalcMap: function getProductScalcMap(templateId) {
@@ -144,7 +179,8 @@ var activeApp = (function () {
                     scalc: scalcLayout[current].scalc,
                     col: scalcLayout[current].col
                 };
-            },
+            }
+            ,
             // 使用文章楼层的布局
             getArticleScalcMap: function getArticleScalcMap(templateId) {
                 var current = this.isMobile ? 'mobile' : 'pc';
@@ -153,7 +189,8 @@ var activeApp = (function () {
                     scalc: scalcLayout[current],
                     swiper: scalcLayout['swiper']
                 };
-            },
+            }
+            ,
             // 使用图片楼层的布局
             getImageScalcMap: function getImageScalcMap(templateId) {
                 var current = this.isMobile ? 'mobile' : 'pc';
@@ -162,7 +199,8 @@ var activeApp = (function () {
                     scalc: scalcLayout[current],
                     swiper: scalcLayout['swiper']
                 };
-            },
+            }
+            ,
             // 使用直播楼层的布局
             getVideoScalcMap: function getVideoScalcMap(templateId) {
                 var current = this.isMobile ? 'mobile' : 'pc';
@@ -171,15 +209,18 @@ var activeApp = (function () {
                     scalc: scalcLayout[current],
                     swiper: scalcLayout['swiper']
                 };
-            },
+            }
+            ,
             // 处理link
             reallink: function reallink(link) {
                 return link ? link : 'javascript:void(0)';
-            },
+            }
+            ,
             handleToggleActive: function handleToggleActive(flag) {
                 console.log(flag);
                 this.isActive = flag;
-            },
+            }
+            ,
             // 页面挂载完毕
             pageLoaded: function pageLoaded() {
                 // 轮播图配置
@@ -195,10 +236,10 @@ var activeApp = (function () {
                 var timer = setInterval(function () {
                     if (!that.isRequest) {
                         that.swiperList = utils.createSwiper(options);
-                        console.log(that.swiperList);
+                        // console.log(that.swiperList);
                         console.log('轮播图创建完毕...');
                         that.initCountMap(countMapping);
-                        console.log(this.countMap);
+                        // console.log(that.countMap);
                         console.log('商品列表处理完毕...');
                         utils.responsive('.aspect', 'scalc');
                         that.isLoading = false;
@@ -216,11 +257,29 @@ var activeApp = (function () {
                     }, 200);
                     activeApp.$set(activeApp.$data, 'isMobile', window.innerWidth < 560);
                 });
-                window.addEventListener('scroll', function(event){
+                window.addEventListener('scroll', function (event) {
                     that.scrollTopSize = $('body').scrollTop();
                 });
                 console.log('窗口resize事件注册完毕...');
             }
+            ,
+            //    初始化用户信息
+            initUserInfo: function initUserInfo() {
+                var userInfo = localStorage.getItem('userInfo');
+                if (!userInfo) {
+                    console.log('用户未登录...');
+                    return false
+                }
+                this.globalUserData = JSON.parse(localStorage.getItem('userInfo'));
+                this.GLOBAL_USER_ID = this.globalUserData.userId * 1;
+                this.GLOBAL_USER_IDENTITY = this.globalUserData.userIdentity * 1;
+                this.GLOBAL_SHOP_ID = this.globalUserData.shopId * 1;
+                if (this.GLOBAL_USER_ID === 5261 || this.GLOBAL_USER_ID === 10947 || this.GLOBAL_USER_ID === 11579) {
+                    this.GLOBAL_USER_IDENTITY = 1;
+                }
+                console.log('已获取用户登录信息')
+            }
         }
-    });
+    })
+        ;
 })();

src/main/resources/static/js/activity/utils.js

@@ -1,100 +1,124 @@
 'use strict';
 
-var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
+var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+    return typeof obj;
+} : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
+};
 
 var _typeof = typeof Symbol === 'function' && _typeof2(Symbol.iterator) === 'symbol' ? function (obj) {
-	return typeof obj === 'undefined' ? 'undefined' : _typeof2(obj);
+    return typeof obj === 'undefined' ? 'undefined' : _typeof2(obj);
 } : function (obj) {
-	return obj && typeof Symbol === 'function' && obj.constructor === Symbol ? 'symbol' : typeof obj === 'undefined' ? 'undefined' : _typeof2(obj);
+    return obj && typeof Symbol === 'function' && obj.constructor === Symbol ? 'symbol' : typeof obj === 'undefined' ? 'undefined' : _typeof2(obj);
 };
 
 // 工具库
 var utils = function () {
-	/**
-  * 固定宽高比
-  * @param {String} bind 绑定元素
-  * @param {String} attr 定义从元素的那个data-attr字段中获取长宽比，其值为一个数值，number 或者 float，默认为 1
-  */
-	function responsive(bind, attr) {
-		try {
-			var list = document.querySelectorAll(bind);
-			list.forEach(function (item) {
-				var scalc = parseFloat(item.getAttribute('data-' + attr)) || 1;
-				item.style.height = item.offsetWidth * scalc + 'px';
-			});
-		} catch (error) {
-			throw new Error(error);
-		}
-	}
+    /**
+     * 固定宽高比
+     * @param {String} bind 绑定元素
+     * @param {String} attr 定义从元素的那个data-attr字段中获取长宽比，其值为一个数值，number 或者 float，默认为 1
+     */
+    function responsive(bind, attr) {
+        try {
+            var list = document.querySelectorAll(bind);
+            list.forEach(function (item) {
+                var scalc = parseFloat(item.getAttribute('data-' + attr)) || 1;
+                item.style.height = item.offsetWidth * scalc + 'px';
+            });
+        } catch (error) {
+            throw new Error(error);
+        }
+    }
+
+    /**
+     * 批量创建轮播图
+     * @param {Object} [options={}] 配置对象
+     * el: 轮播图最外层容器的class， 默认为 .swiper-container
+     * split: 轮播图id的拼接方式，默认为 - ，为了获取轮播图唯一id值，如swiper-template-1, 解析后的id就为1
+     * config：轮播图的相关配置，由键值对构成，例如：{'swiper-template-1':{ swiper相关配置，详见swiper官网 }}
+     * protertyFix：将和attr中的值一起构成config中的key 默认值为swiper-template-
+     * attr: 将和protertyFix的值一起构成config中的key 默认值为floor-type
+     * @return {Object} 所有轮播图的实例，{key：swiper,...}，key的值为swiper最外层容器的id
+     */
+    function createSwiper() {
+        var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
+
+        // 默认配置
+        var o = {
+            el: 'swiper-container',
+            split: '-',
+            config: {},
+            protertyFix: 'swiper-template-',
+            attr: 'swiper-type'
+        };
+        if (options) {
+            Object.assign(o, options);
+        }
+        // 保存轮播图实例对象
+        var swipers = {};
+        var list = document.querySelectorAll(o.el);
+        list.forEach(function (item) {
+            var id = item.getAttribute('data-' + o.attr);
+            if (!item.id || !id) return;
+            // 模板id
+            // var id = item.id.split(options.split)[2]
+            swipers[item.id] = new Swiper('#' + item.id, o.config[o.protertyFix + id]);
+        });
+        return swipers;
+    }
 
-	/**
-  * 批量创建轮播图
-  * @param {Object} [options={}] 配置对象
-  * el: 轮播图最外层容器的class， 默认为 .swiper-container
-  * split: 轮播图id的拼接方式，默认为 - ，为了获取轮播图唯一id值，如swiper-template-1, 解析后的id就为1
-  * config：轮播图的相关配置，由键值对构成，例如：{'swiper-template-1':{ swiper相关配置，详见swiper官网 }}
-  * protertyFix：将和attr中的值一起构成config中的key 默认值为swiper-template-
-  * attr: 将和protertyFix的值一起构成config中的key 默认值为floor-type
-  * @return {Object} 所有轮播图的实例，{key：swiper,...}，key的值为swiper最外层容器的id
-  */
-	function createSwiper() {
-		var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
+    // 创建轮播图
+    function createSwiperId(el, options) {
+        var list = document.querySelector('#' + el);
+        var swiperType = list.getAttribute('data-swiper-type');
+        return new Swiper('#' + el, options['swiper-template-' + swiperType]);
+    }
 
-		// 默认配置
-		var o = {
-			el: 'swiper-container',
-			split: '-',
-			config: {},
-			protertyFix: 'swiper-template-',
-			attr: 'swiper-type'
-		};
-		if (options) {
-			Object.assign(o, options);
-		}
-		// 保存轮播图实例对象
-		var swipers = {};
-		var list = document.querySelectorAll(o.el);
-		list.forEach(function (item) {
-			var id = item.getAttribute('data-' + o.attr);
-			if (!item.id || !id) return;
-			// 模板id
-			// var id = item.id.split(options.split)[2]
-			swipers[item.id] = new Swiper('#' + item.id, o.config[o.protertyFix + id]);
-		});
-		return swipers;
-	}
+    // 判断arr是否为一个数组，返回一个bool值
+    function isArray(arr) {
+        return Object.prototype.toString.call(arr) === '[object Array]';
+    }
 
-	// 创建轮播图
-	function createSwiperId(el, options) {
-		var list = document.querySelector('#' + el);
-		var swiperType = list.getAttribute('data-swiper-type');
-		return new Swiper('#' + el, options['swiper-template-' + swiperType]);
-	}
+    // 深度克隆
+    function deepClone(obj) {
+        if ((typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) !== 'object' && typeof obj !== 'function') {
+            return obj; //原始类型直接返回
+        }
+        var o = isArray(obj) ? [] : {};
+        for (var i in obj) {
+            if (obj.hasOwnProperty(i)) {
+                o[i] = _typeof(obj[i]) === 'object' ? deepClone(obj[i]) : obj[i];
+            }
+        }
+        return o;
+    }
 
-	// 判断arr是否为一个数组，返回一个bool值
-	function isArray(arr) {
-		return Object.prototype.toString.call(arr) === '[object Array]';
-	}
+    //从cokie中获取用户信息
+    function getBaseCookie(cname) {
+        if (document.cookie) {
+            var name = cname + "=";
+            var ca = document.cookie.split(';');
+            for (var i = 0; i < ca.length; i++) {
+                var c = ca[i].trim();
+                if (c && c.indexOf(name) === 0) {
+                    return c.substring(name.length, c.length);
+                }
+            }
+        }
+        return "";
+    }
 
-	// 深度克隆
-	function deepClone(obj) {
-		if ((typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) !== 'object' && typeof obj !== 'function') {
-			return obj; //原始类型直接返回
-		}
-		var o = isArray(obj) ? [] : {};
-		for (var i in obj) {
-			if (obj.hasOwnProperty(i)) {
-				o[i] = _typeof(obj[i]) === 'object' ? deepClone(obj[i]) : obj[i];
-			}
-		}
-		return o;
-	}
 
-	return {
-		responsive: responsive,
-		createSwiper: createSwiper,
-		deepClone: deepClone,
-		createSwiperId: createSwiperId,
-		test: 300
-	};
+    return {
+        responsive: responsive,
+        createSwiper: createSwiper,
+        deepClone: deepClone,
+        createSwiperId: createSwiperId,
+        getBaseCookie: getBaseCookie
+    };
 }();
+
+
+
+

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

@@ -95,8 +95,95 @@
                                                         <!-- <span class="cm-tag color3">单品满减</span> -->
                                                         <span class="cm-tag color2" v-if="pros.listType == 2">{{ pros.label }}</span>
                                                     </div>
-                                                    <div class="cm-prodcut-price h24"><span>￥</span><span
-                                                            class="p-icon i3"></span></div>
+                                                    <div class="cm-prodcut-price h24">
+                                                        <div class="pro-price" v-if="pros.listType == 1">
+                                                            <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                                                <template v-if="pros.product.productCategory==1">
+                                                                    <!-- 样式1 价格未公开-->
+                                                                    <template v-if="pros.product.priceFlag==1">
+                                                                        <div class="price-tag cm-left">
+                                                                            <span class="tag"
+                                                                                  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                        </div>
+                                                                        <div class="price cm-left">￥价格未公开</div>
+                                                                    </template>
+                                                                    <template v-else>
+                                                                        <!-- 样式2-->
+                                                                        <template
+                                                                                v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                                                            <div class="price-tag cm-left">
+                                                                                <span class="tag"
+                                                                                      v-if="pros.product.actStatus==1">
+                                                                                  {{pros.product.promotions.name}}
+                                                                                  <span class="red"
+                                                                                        v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
+                                                                                </span>
+                                                                            </div>
+                                                                            <div class="price cm-left"
+                                                                                 :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
+                                                                                <span class="red">
+                                                                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                                                                  : pros.product.price) | NumFormat }}
+                                                                                </span>
+                                                                            </div>
+                                                                        </template>
+                                                                        <!-- 样式3 -->
+                                                                        <template
+                                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                                            <div class="price-tag cm-left"
+                                                                                 v-if="pros.product.actStatus==1">
+                                                                                <span class="tag">{{pros.product.promotions.name}}</span>
+                                                                            </div>
+                                                                            <div class="price cm-left">
+                                                                                <span>￥会员可见</span></div>
+                                                                        </template>
+                                                                        <!-- 样式4 -->
+                                                                        <template v-else>
+                                                                            <div class="price-tag cm-left"
+                                                                                 v-if="pros.product.actStatus==1">
+                                                                                <span class="tag">{{pros.product.promotions.name}}</span>
+                                                                            </div>
+                                                                            <div class="price cm-left"><span>￥</span>
+                                                                                <span class="p-icon"
+                                                                                      :class="'i'+pros.product.priceGrade"></span>
+                                                                            </div>
+                                                                        </template>
+                                                                    </template>
+                                                                </template>
+                                                                <!-- 样式5 -->
+                                                                <template v-else>
+                                                                    <div class="price-tag cm-left"></div>
+                                                                    <div class="price"
+                                                                         v-if="pros.product.detailTalkFlag == '2'">￥价格详聊
+                                                                    </div>
+                                                                    <div class="price cm-left" v-else>
+                                                                        <span class="red">￥{{ pros.product.price | NumFormat }}</span>
+                                                                    </div>
+                                                                </template>
+                                                            </template>
+                                                            <template v-else>
+                                                                <!-- 样式6 -->
+                                                                <template v-if="pros.product.productCategory == 1">
+                                                                    <div class="price-tag cm-left"
+                                                                         v-if="params.userId>0">
+                                                                        <span class="tag"
+                                                                              v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                    </div>
+                                                                    <div class="price cm-left ">
+                                                                        <span>￥</span>
+                                                                        <span class="p-icon"
+                                                                              :class="'i'+pros.product.priceGrade"></span>
+                                                                    </div>
+                                                                </template>
+                                                                <!-- 样式7 -->
+                                                                <template v-else>
+                                                                    <div class="price-tag cm-left"></div>
+                                                                    <div class="price  cm-left"><span>￥登录可见</span></div>
+                                                                </template>
+                                                            </template>
+                                                        </div>
+
+                                                    </div>
                                                 </div>
                                             </div>
                                         </a>
@@ -123,7 +210,8 @@
                                 >
                                     <div class="aspect"
                                          :data-scalc="getProductScalcMap(floorData.floorContent.templateType).scalc[index]">
-                                        <a target="_blank" :href="reallink(floorData.floorContent['adsLink' + (index + 1)])">
+                                        <a target="_blank"
+                                           :href="reallink(floorData.floorContent['adsLink' + (index + 1)])">
                                             <img
                                                     width="100%"
                                                     height="100%"
@@ -164,8 +252,94 @@
                                                     <!-- <span class="cm-tag color3">单品满减</span> -->
                                                     <span class="cm-tag color2" v-if="pros.listType == 2">{{ pros.label }}</span>
                                                 </div>
-                                                <div class="cm-prodcut-price h24"><span>￥</span><span
-                                                        class="p-icon i3"></span></div>
+                                                <div class="cm-prodcut-price h24">
+                                                    <div class="pro-price cm-clearfix" v-if="pros.listType == 1">
+                                                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                                            <template v-if="pros.product.productCategory != 1">
+                                                                <!-- 样式1 价格未公开-->
+                                                                <template v-if="pros.product.priceFlag == 1">
+                                                                    <div class="price-tag cm-left">
+                                                                            <span class="tag"
+                                                                                  v-if="pros.product.actStatus == 1">{{pros.product.promotions.name}}</span>
+                                                                    </div>
+                                                                    <div class="price cm-left">￥价格未公开</div>
+                                                                </template>
+                                                                <template v-else>
+                                                                    <!-- 样式2-->
+                                                                    <template
+                                                                            v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                                                        <div class="price-tag  cm-left">
+                                                                                <span class="tag"
+                                                                                      v-if="pros.product.actStatus==1">
+                                                                                  {{pros.product.promotions.name}}
+                                                                                  <span class="red"
+                                                                                        v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
+                                                                                </span>
+                                                                        </div>
+                                                                        <div class="price  cm-left"
+                                                                             :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
+                                                                                <span class="red">
+                                                                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                                                                  : pros.product.price) | NumFormat }}
+                                                                                </span>
+                                                                        </div>
+                                                                    </template>
+                                                                    <!-- 样式3 -->
+                                                                    <template
+                                                                            v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                                        <div class="price-tag cm-left"
+                                                                             v-if="pros.product.actStatus==1">
+                                                                            <span class="tag">{{pros.product.promotions.name}}</span>
+                                                                        </div>
+                                                                        <div class="price cm-left"><span>￥会员可见</span>
+                                                                        </div>
+                                                                    </template>
+                                                                    <!-- 样式4 -->
+                                                                    <template v-else>
+                                                                        <div class="price-tag cm-left"
+                                                                             v-if="pros.product.actStatus==1">
+                                                                            <span class="tag">{{pros.product.promotions.name}}</span>
+                                                                        </div>
+                                                                        <div class="price cm-left"><span>￥</span>
+                                                                            <span class="p-icon"
+                                                                                  :class="'i'+pros.product.priceGrade"></span>
+                                                                        </div>
+                                                                    </template>
+                                                                </template>
+                                                            </template>
+                                                            <!-- 样式5 -->
+                                                            <template v-else>
+                                                                <div class="price-tag cm-left"></div>
+                                                                <div class="price"
+                                                                     v-if="pros.product.detailTalkFlag == '2'">￥价格详聊
+                                                                </div>
+                                                                <div class="price cm-left" v-else>
+                                                                    <span class="red">￥{{ pros.product.price | NumFormat }}</span>
+                                                                </div>
+                                                            </template>
+                                                        </template>
+                                                        <template v-else>
+                                                            <!-- 样式6 -->
+                                                            <template v-if="pros.product.productCategory == 1">
+                                                                <div class="price-tag cm-left" v-if="params.userId>0">
+                                                                        <span class="tag"
+                                                                              v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                </div>
+                                                                <div class="price cm-left ">
+                                                                    <span>￥</span>
+                                                                    <span class="p-icon"
+                                                                          :class="'i'+pros.product.priceGrade"></span>
+                                                                </div>
+                                                            </template>
+                                                            <!-- 样式7 -->
+                                                            <template v-else>
+                                                                <div class="price-tag cm-left"></div>
+                                                                <div class="price  cm-left"><span>￥登录可见</span></div>
+                                                            </template>
+                                                        </template>
+                                                    </div>
+
+                                                </div>
                                             </div>
                                         </div>
                                     </a>
@@ -179,7 +353,8 @@
                                 >
                                     <div class="aspect"
                                          :data-scalc="getProductScalcMap(floorData.floorContent.templateType).scalc[index]">
-                                        <a target="_blank" :href="reallink(floorData.floorContent['adsLink' + (index + 1)])">
+                                        <a target="_blank"
+                                           :href="reallink(floorData.floorContent['adsLink' + (index + 1)])">
                                             <img
                                                     width="100%"
                                                     height="100%"
@@ -600,7 +775,8 @@
     <div class="cm-entry" v-show="activityEntryVisiable && isActive">
         <div class="cm-icon-content">
             <span class="cm-close" @click="handleToggleActive(false)"></span>
-            <a target="_blank" href="/user/coupon-collection.html">
+            <a id="entry" target="_blank" href="/user/coupon-collection.html"
+               onclick="_czc.push(['_trackEvent','云上美博会','点击','红包优惠券','1','entry'])">
                 <img src="/img/activity/pc_icon.png" alt=""/>
             </a>
         </div>
@@ -625,6 +801,7 @@
 <script charset="utf-8" src="/js/activity/swiper.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/activity/base.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="@{/js/activity/utils.js(v=${version})}"></script>
@@ -632,6 +809,12 @@
 <script charset="utf-8" type="text/javascript" th:src="@{/js/activity/mixin.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/activity/index.js(v=${version})}"></script>
 <script>
+    var isFormal = window.location.href.indexOf('www.caimei365.com') !== -1;
+    if (isFormal) {
+        document.write(unescape("%3Cspan id='cnzz_stat_icon_1279558759'%3E%3C/span%3E%3Cscript src='https://s9.cnzz.com/z_stat.php%3Fid%3D1279558759%26show%3Dpic' type='text/javascript'%3E%3C/script%3E"));
+        var _czc = _czc || [];
+        _czc.push(["_setAccount", "1279558759"]);
+    }
     $('#cm-to-top').on("click", function () {
         $("html,body").animate({scrollTop: 0}, 500);
     });