Merge branch 'developer' of http://git.caimei365.com/caimei-repository/caimei-applets-caimei into developer

components/cm-module/activityContact/index.vue

@@ -7,13 +7,18 @@
         </view>
         <!-- 展开状态 -->
         <view class="cm-close-box" v-show="contactVisiable && isActive">
-            <view class="cm-icon cm-entry" @click="handleToggleEntry(true)" v-if="activityEntryVisiable"></view>
+            <!-- <view class="cm-icon cm-entry" @click="handleToggleEntry(true)" v-if="activityEntryVisiable"></view> -->
+            <view class="cm-icon regexp" @click="handleToCouponExp">优惠券\n规则</view>
             <view class="cm-icon cm-bround cm-mobile" @click="handelShowMobile">
                 <view class="cm-dialog" v-show="mobileVisiable">
                     <view class="cm-dialog-content content1">
-                        <view class="cm-item" @click="phoneCall('15338897365')"> <text>展会咨询电话：15338897365</text> </view>
+                        <view class="cm-item" @click="phoneCall('15338897365')">
+                            <text>展会咨询电话：15338897365</text>
+                        </view>
                         <view class="cm-line line1"></view>
-                        <view class="cm-item" @click="phoneCall('15338851365')"> <text>客服咨询电话：15338851365</text> </view>
+                        <view class="cm-item" @click="phoneCall('15338851365')">
+                            <text>客服咨询电话：15338851365</text>
+                        </view>
                     </view>
                 </view>
             </view>
@@ -42,7 +47,7 @@
             </view>
             <view class="cm-icon cm-bround cm-close-btn" @click="handleToggleAcitve(false)"></view>
         </view>
-        <view class="mask cover" v-if="activityEntryVisiable && entryVisiable">
+        <!-- <view class="mask cover" v-if="activityEntryVisiable && entryVisiable">
             <view class="content">
                 <image
                     src="https://static.caimei365.com/app/img/icon2/cm_entry_bg.png"
@@ -60,6 +65,17 @@
                 <image src="https://static.caimei365.com/app/img/icon2/coupon-entry-app.png" mode="widthFix"></image>
                 <view class="mask-close" @click="handleToggleCoupon(false)"></view>
             </view>
+        </view> -->
+
+        <view class="mask cover" v-if="showCouponEntryNew">
+            <view class="content">
+                <image
+                    src="https://static.caimei365.com/app/img/icon2/coupon-entry-app.png"
+                    mode="widthFix"
+                    @click="handleNaviagtorToCoupon"
+                ></image>
+                <view class="mask-close" @click="showCouponEntryNew = false"></view>
+            </view>
         </view>
 
         <view class="mask" v-if="mobileVisiable || wechatVisiable" @click="handleClose"></view>
@@ -81,7 +97,8 @@ export default {
             entryVisiable: true,
             activityEntryVisiable: false,
             contactVisiable: false,
-            showCouponEntry: false
+            showCouponEntry: false,
+            showCouponEntryNew: false
         }
     },
     created() {
@@ -90,12 +107,12 @@ export default {
             this.pageInfo.redPacketBeginTime,
             this.pageInfo.redPacketEndTime
         )
-        this.showCouponEntry = true
+        this.showCouponEntryNew = true
         console.log(this.pageInfo)
-    }, 
+    },
     methods: {
         // 拨打电话
-        phoneCall(number){
+        phoneCall(number) {
             console.log(number)
             uni.makePhoneCall({
                 phoneNumber: number //仅为示例
@@ -126,6 +143,15 @@ export default {
         handleToggleEntry(visiable) {
             this.entryVisiable = visiable
         },
+        // 跳转到领取优惠券
+        handleNaviagtorToCoupon(){
+            this.$api.navigateTo('/pages/user/coupon/coupon-collection')
+        },
+        handleToCouponExp(){
+            // this.$api.navigateTo('/pages/h5/activity/couponExp')
+            this.$api.navigateTo('/pages/h5/article/path?link=https://www.caimei365.com/help/1038.html')
+            
+        },
         navigatorToPro(flag) {
             // 友盟自定义事件
             if (process.env.NODE_ENV != 'development') {
@@ -188,11 +214,22 @@ export default {
 .cm-close-box {
     position: relative;
     z-index: 9;
+    
     .cm-icon {
         position: relative;
         width: 80rpx;
         height: 80rpx;
         margin: 10rpx 0;
+        &.regexp{
+            border-radius: 50%;
+            font-size: 20rpx;
+            background: rgba(0, 0, 0, 0.4);
+            justify-content: center;
+            align-items: center;
+            display: flex;
+            color: #fff;
+            text-align: center;
+        }
         &.cm-bround {
             border-radius: 50%;
         }

pages/goods/product.vue

@@ -90,9 +90,10 @@
 								>
 									<swiper-item v-for="(item, index) in productImage" :key="index" class="banner-item">
 										<image :src="item" @click="previewImg(index)" class="product-img" />
-										<view class="cm-product-cover" v-if="product.appletsActType === 1"
+										<!-- <view class="cm-product-cover" v-if="product.appletsActType === 1"
 											>云上美博会</view
-										>
+										> -->
+                                        <view class="cm-product-cover" v-if="product.appletsActType === 1"></view>
 									</swiper-item>
 								</swiper>
 								<view class="swiper__dots-box">
@@ -1527,16 +1528,19 @@ page {
 		position: relative;
 		.cm-product-cover {
 			position: absolute;
-			right: 30rpx;
-			top: 30rpx;
-			width: 147rpx;
-			height: 57rpx;
+            right: 30rpx;
+            top: 0;
+            width: 120rpx;
+            height: 77rpx;
+			// right: 30rpx;
+			// top: 30rpx;
+			// width: 147rpx;
 			line-height: 57rpx;
 			font-size: 24rpx;
 			color: #fff;
 			text-align: center;
 			background: url(https://static.caimei365.com/app/img/icon2/cm_cover_bg_app.png) no-repeat center;
-			background-size: 147rpx;
+			background-size: 120rpx;
 		}
 	}
 }

services/config.env.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
     // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
-    URL_CONFIG = 'https://core-b.caimei365.com'
-    // URL_CONFIG = 'https://core.caimei365.com'
+    // URL_CONFIG = 'https://core-b.caimei365.com'
+    URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'