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

App.vue

@@ -57,13 +57,13 @@
 				}
 			})
 			this.refresh()
-			// if(uni.getStorageSync('isActivityStatus')){
-			// 	const  lockTime = uni.getStorageSync('lockTime')
-			// 	const  eTime = this.diffTime(lockTime)
-			// 	this.$store.dispatch('setActivityFn',eTime)
-			// }else{
-			// 	this.$store.dispatch('setActivityFn',true)
-			// }
+			if(uni.getStorageSync('isActivityStatus')){
+				const  lockTime = uni.getStorageSync('lockTime')
+				const  eTime = this.diffTime(lockTime)
+				this.$store.dispatch('setActivityFn',eTime)
+			}else{
+				this.$store.dispatch('setActivityFn',true)
+			}
 		},
 		methods:{
 			...mapMutations(['login','logout','isWxAuthorize']),

components/cm-module/activity/activity_01.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
 		<view class="tui-alert-class tui-alert-box" :class="[show?'tui-alert-show':'tui-alert-hide']"  @touchmove.stop.prevent="discard">
-			<image src="http://static.caimei365.com/app/meibohui/meibo_coupon_01.png" mode="" @click.stop="handleClick"></image>
+			<image src="http://static.caimei365.com/app/meibohui/app/activity-pop.png" mode="" @click.stop="handleClick"></image>
 			<text class="iconfont icon-2guanbi" @click.stop="handleClickCancel"></text>
 		</view>
-	</view>
+	</view> 
 </template>
 
 <script>
@@ -72,8 +72,8 @@
 		background: rgba(0,0,0,.2);
 		z-index: 99999;
 		image{
-			width: 606rpx;
-			height: 510rpx;
+			width: 729rpx;
+			height: 560rpx;
 			margin-top: 130rpx;
 		}
 	}

components/cm-module/pcitureTemplate/templateA.vue

@@ -11,7 +11,7 @@
 			>
 				<swiper-item class="clearfix" v-for="(list,index1) in productList" :key="index1">
 					<view class="img-box" v-for="(product,index2) in list" :key="index2" @click="navigaitionTo(product)">
-						<image :src="product.appletsImage" mode="aspectFill"></image>
+						<image :src="product.appletsImage" ></image>
 					</view>
 				</swiper-item>
 			</swiper>

components/cm-module/pcitureTemplate/templateB.vue

@@ -11,7 +11,7 @@
 			>
 				<swiper-item class="clearfix" v-for="(list,index1) in productList" :key="index1">
 					<view class="img-box"  v-for="(product,index2) in list" :key="index2" @click="navigaitionTo(product)">
-						<image :src="product.appletsImage" mode="aspectFill"></image>
+						<image :src="product.appletsImage" ></image>
 					</view>
 				</swiper-item>
 			</swiper>

components/cm-module/pcitureTemplate/templateC.vue

@@ -1,7 +1,7 @@
 <template>
 	<scroll-view scroll-x="true" class="picture">
 		<view class="section" v-for="(item , index) in productList" @click="navigaitionTo(item)">
-			<image :src="item.appletsImage" mode="heightFix"></image>
+			<image :src="item.appletsImage" ></image>
 		</view>
 	</scroll-view>
 </template>

components/cm-module/pcitureTemplate/templateD.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="picture">
 		<view class="section" v-for="(item,index) in productList" :key="index" @click="navigaitionTo(item)">
-			<image :src="item.appletsImage" mode="widthFix"></image>
+			<image :src="item.appletsImage" ></image>
 		</view>
 	</view>
 </template>

components/cm-module/pcitureTemplate/templateE.vue

@@ -11,7 +11,7 @@
 			>
 				<swiper-item class="clearfix"  v-for="(list,index1) in productList" :key="index1">
 					<view class="img-box"  v-for="(product,index2) in list" :key="index2" @click="navigaitionTo(product)">
-						<image :src="product.appletsImage" mode="aspectFill"></image>
+						<image :src="product.appletsImage" ></image>
 					</view>
 				</swiper-item>
 			</swiper>

components/cm-module/pcitureTemplate/templateF.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="picture">
 		<view class="section" v-for="(item,index) in productList" :key="index" @click="navigaitionTo(item)">
-			<image :src="item.appletsImage" mode="heightFix"></image>
+			<image :src="item.appletsImage" ></image>
 		</view>
 	</view>
 </template>

pages/tabBar/home/index.vue

@@ -19,7 +19,7 @@
 		<!-- 侧边 -->
 		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
 		<!-- 活动弹窗 -->
-		<!-- <activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert> -->
+		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert>
 	</view>
 </template>
 
@@ -159,10 +159,20 @@
 				})
 			},
 			handleClick(data){
-				this.$api.navigateTo(`/h5/pages/activity/meobohui`)
+				const pageId = 306
+				this.$api.navigateTo(`/h5/pages/activity/activity-topic?linkId=${pageId}`)
 				this.$store.commit('setActivity',data)
 				uni.setStorageSync('lockTime',Date.now())	
-				uni.setStorageSync('isActivityStatus',true)	
+				uni.setStorageSync('isActivityStatus',true)
+				// debugger
+				// 友盟自定义事件
+				if(process.env.NODE_ENV != 'development'){
+					this.$uma.trackEvent('meibohui_click', {
+						Um_Key_PageName: '美博会',
+						Um_Key_PageCategory: '活动专题页面',
+						Um_Key_SourcePage: '首页',
+					})
+				}
 			},
 			handleCancelClick(data){
 				this.$store.commit('setActivity',data)

pages/tabBar/user/user.vue

@@ -100,9 +100,9 @@
 			</view>
 			<!-- 底部跳转 -->
 			<view class="foot-list">
-<!-- 				<view class="list-cell-avtiv" @click="navigator('/pages/user/coupon/coupon')">
-					<image src="http://static.caimei365.com/app/meibohui/meibo_coupon_03.png" mode=""></image>
-				</view> -->
+				<view class="list-cell-avtiv" @click="navigator('/pages/user/coupon/coupon')">
+					<image src="http://static.caimei365.com/app/meibohui/app/activity-in.png" mode=""></image>
+				</view>
 				<view class="list-cell-item" v-show="hasLogin">
 					<view class="list-cell" v-show="userIdentity == 4" @click="navigator(`/pages/login/apply?clubStatus=${clubStatus}`)" hover-class="cell-hover" :hover-stay-time="50">
 						<text class="cell-icon"><text class="iconfont icon-shengjihuiyuanjigou"></text></text>

pages/user/coupon/coupon.vue

@@ -2,7 +2,7 @@
 	<view class="container home clearfix">
 		<view class="coupon-title" v-if="userIdentity == 4">优惠券仅限{{userName}}（机构）使用 </view>
 		<view class="coupon-title" v-if="userIdentity == 2">优惠券仅限{{userName}}使用 </view>
-		<image class="coupon-image" src="http://static.caimei365.com/app/meibohui/meibo_coupon_04.jpg" mode=""></image>
+		<image class="coupon-image" src="http://static.caimei365.com/app/meibohui/app/activity-detail.jpg" mode=""></image>
 	</view>
 </template>
 
@@ -62,7 +62,7 @@
 		}
 		.coupon-image{
 			width: 100%;
-			height: 2381rpx;
+			height: 1860rpx;
 			display: block;
 			
 		}