commit -m 采美豆登录

components/cm-module/activity/activityBean.vue

@@ -1,22 +1,29 @@
  <template>
 	<view>
 		<view class="tui-alert-class tui-alert-box" :class="[show?'tui-alert-show':'tui-alert-hide']"  @touchmove.stop.prevent="discard">
-			<view class="tui-alert-content" :style="{'background-image': 'url('+bgImagePath+')'}">
-				<view class="tui-alert-content-text">恭喜您获得采美豆！</view>
-				<view class="tui-alert-content-bean">
-					<view class="tui-alert-main">
-						<image class="tui-alert-icon" src="https://static.caimei365.com/app/img/icon/bean-icon@2x.png" mode=""></image>
-						<view class="tui-alert-text">
-							<text class="icon-add">+</text>
-							<text class="icon-text">{{ beanNumber }}</text>
+			<template v-if="beansType == 12">
+				<view class="tui-alert-image">
+					<image :src="bgImagePath" mode=""></image>
+				</view>
+			</template>
+			<template v-else>
+				<view class="tui-alert-content" :style="{'background-image': 'url('+bgImagePath+')'}">
+					<view class="tui-alert-content-text">恭喜您获得采美豆！</view>
+					<view class="tui-alert-content-bean">
+						<view class="tui-alert-main">
+							<image class="tui-alert-icon" src="https://static.caimei365.com/app/img/icon/bean-icon@2x.png" mode=""></image>
+							<view class="tui-alert-text">
+								<text class="icon-add">+</text>
+								<text class="icon-text">{{ beanNumber }}</text>
+							</view>
 						</view>
 					</view>
+					<view class="tui-alert-content-tips">
+						<view class="tips">采美豆可抵扣运费</view>
+					</view>
 				</view>
-				<view class="tui-alert-content-tips">
-					<view class="tips">采美豆可抵扣运费</view>
-				</view>
-			</view>
-			<text class="iconfont icon-2guanbi" @click.stop="handleClickCancel"></text>
+			</template>
+			<text class="iconfont icon-2guanbi" :style="{bottom :beansType == 12 ? '25%' : '13%'}" @click.stop="handleClickCancel"></text>
 		</view>
 	</view> 
 </template>
@@ -99,7 +106,7 @@
 		left: 0;
 		top: 100%;
 		opacity: 0;
-		background: rgba(51,51,51,0.5);
+		background: rgba(51,51,51,0.7);
 		z-index: 99999;
 	}
 	.tui-alert-show {
@@ -112,6 +119,21 @@
 		opacity: 0;
 		// animation:rundbottom 0.5s;
 	}
+	.tui-alert-image{
+		width: 626rpx;
+		height: 532rpx;
+		position: absolute;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		margin: auto;
+		image{
+			width: 626rpx;
+			height: 532rpx;
+			display: block;
+		}
+	}
 	.tui-alert-content{
 		width: 580rpx;
 		height: 790rpx;
@@ -193,7 +215,7 @@
 		position: absolute;
 		bottom: 13%;
 		left: 50%;
-		font-size: 60rpx;
+		font-size: 58rpx;
 		margin-left: -50rpx;
 	}
 	.tui-alert-mask-show {

pages/tabBar/home/index.vue

@@ -78,8 +78,8 @@
 				isRequest:false,
 				isNavRequest:false,
 				isLiveRequest:false,
-				isActivityBean:false,
-				beansType:1,
+				isActivityBean:true,
+				beansType:12,
 				beanNumber:50,
 			}
 		},