Merge remote-tracking branch 'remotes/origin/developer' into developerC

components/cm-module/activityContact/index.vue

@@ -42,11 +42,15 @@
         </view>
         <view class="mask cover" v-if="activityEntryVisiable && entryVisiable">
             <view class="content">
-                <image src="https://static.caimei365.com/app/img/icon2/cm_entry_bg.png" mode="widthFix" @click="handleToggleCoupon(true)"></image>
+                <image
+                    src="https://static.caimei365.com/app/img/icon2/cm_entry_bg.png"
+                    mode="widthFix"
+                    @click="handleToggleCoupon(true)"
+                ></image>
                 <view class="mask-close" @click="handleToggleEntry(false)"></view>
             </view>
         </view>
-        
+
         <view class="mask cover" v-if="showCouponEntry">
             <view class="content">
                 <view class="btn btn1" @click="navigatorToPro(1)"></view>
@@ -55,7 +59,7 @@
                 <view class="mask-close" @click="handleToggleCoupon(false)"></view>
             </view>
         </view>
-        
+
         <view class="mask" v-if="mobileVisiable || wechatVisiable" @click="handleClose"></view>
     </view>
 </template>
@@ -75,7 +79,7 @@ export default {
             entryVisiable: true,
             activityEntryVisiable: false,
             contactVisiable: false,
-            showCouponEntry: false,
+            showCouponEntry: false
         }
     },
     created() {
@@ -112,44 +116,44 @@ export default {
         handleToggleEntry(visiable) {
             this.entryVisiable = visiable
         },
-		navigatorToPro(flag){
+        navigatorToPro(flag) {
             // 友盟自定义事件
-            if(process.env.NODE_ENV != 'development'){
-                if(flag === 2 ){
-                    this.$uma.trackEvent('meibohui_cloud_click', {
-                    	Um_Key_PageName: '云上美博会优惠券介绍',
-                    	Um_Key_PageCategory: '活动专题页面',
-                    	Um_Key_SourcePage: '活动专题页面',
+            if (process.env.NODE_ENV != 'development') {
+                if (flag === 2) {
+                    this.$uma.trackEvent('meibohui_Coupon_detail_click', {
+                        Um_Key_PageName: '云上美博会优惠券介绍',
+                        Um_Key_PageCategory: '活动专题页面',
+                        Um_Key_SourcePage: '活动专题页面'
                     })
                 }
-                
-                if(flag === 1){
-                    this.$uma.trackEvent('meibohui_cloud_click', {
-                    	Um_Key_PageName: '云上美博会优惠券购买跳转',
-                    	Um_Key_PageCategory: '活动专题页面',
-                    	Um_Key_SourcePage: '活动专题页面',
+
+                if (flag === 1) {
+                    this.$uma.trackEvent('meibohui_Coupon_buy_click', {
+                        Um_Key_PageName: '云上美博会优惠券购买跳转',
+                        Um_Key_PageCategory: '活动专题页面',
+                        Um_Key_SourcePage: '活动专题页面'
                     })
                 }
             }
-            
-            if(flag === 2) this.$api.navigateTo('/pages/h5/activity/couponExp')
-			else this.$api.navigateTo('/pages/goods/product?id=6898')
+
+            if (flag === 2) this.$api.navigateTo('/pages/h5/activity/couponExp')
+            else this.$api.navigateTo('/pages/goods/product?id=6898')
             this.entryVisiable = false
             this.showCouponEntry = false
-		},
+        },
         // 优惠券入口
-        handleToggleCoupon(flag){
+        handleToggleCoupon(flag) {
             // 友盟自定义事件
-            if(false && process.env.NODE_ENV != 'development'){
-                this.$uma.trackEvent('meibohui_cloud_click', {
-                	Um_Key_PageName: '云上美博会获取弹窗点击',
-                	Um_Key_PageCategory: '活动专题页面',
-                	Um_Key_SourcePage: '活动专题页面',
+            if (flag && process.env.NODE_ENV != 'development') {
+                this.$uma.trackEvent('meibohui_Coupon_click', {
+                    Um_Key_PageName: '云上美博会获取弹窗点击',
+                    Um_Key_PageCategory: '活动专题页面',
+                    Um_Key_SourcePage: '活动专题页面'
                 })
             }
             this.showCouponEntry = flag
             this.entryVisiable = false
-        }, 
+        },
         // 初始化红包入口状态
         initActivityEntry(begin, end) {
             const nowTime = new Date().getTime()
@@ -168,7 +172,7 @@ export default {
 .cm-contact {
     position: fixed;
     right: 20rpx;
-    bottom: 120px;
+    bottom: 240rpx;
     z-index: 9999;
 }
 .cm-close-box {
@@ -236,7 +240,8 @@ export default {
             width: 1px;
             height: 200rpx;
             background: #eee;
-            margin: 0 10rpx;
+            margin: 0 16rpx;
+            margin-top: -50rpx;
         }
     }
     .content1 {
@@ -291,7 +296,7 @@ export default {
             background: url(https://static.caimei365.com/app/img/icon2/cm_float_close.png) no-repeat center;
             background-size: 60rpx 60rpx;
         }
-        .btn{
+        .btn {
             width: 80rpx;
             height: 80rpx;
             background: #666;
@@ -299,10 +304,10 @@ export default {
             position: absolute;
             right: 60rpx;
             opacity: 0;
-            &.btn1{
+            &.btn1 {
                 top: 175rpx;
             }
-            &.btn2{
+            &.btn2 {
                 top: 350rpx;
             }
         }