订单模块 协销确认订单 商品赠品标签

components/cm-module/activity/activityBean.vue

@@ -23,14 +23,14 @@
 					</view>
 				</view>
 			</template>
-			<text class="iconfont icon-2guanbi" :style="{bottom :beansType == 12 ? '25%' : '13%'}" @click.stop="handleClickCancel"></text>
+			<text class="iconfont icon-2guanbi" :style="{bottom :beansType == 12 ? '25%' : '10%'}" @click.stop="handleClickCancel"></text>
 		</view>
 	</view> 
 </template>
 
 <script>
 	export default {
-		name:"tuiAlert",
+		name:'tuiAlert',
 		props: {
 			//控制显示
 			show: {
@@ -45,16 +45,16 @@
 			//提示信息字体颜色
 			color: {
 				type: String,
-				default: "#333"
+				default: '#333'
 			},
 			//按钮字体颜色
 			btnColor: {
 				type: String,
-				default: "#EB0909"
+				default: '#EB0909'
 			},
 			btnText:{
 				type: String,
-				default: ""
+				default: ''
 			},
 			beansType:{//根据类型设置背景图片:1注册机构，2升级会员机构，3普通机构修改资料，4会员机构修改资料，5下单成功，6线上支付成功，7确认收货成功
 				type: Number,
@@ -80,12 +80,12 @@
 				console.log(this.bgImagePath)
 			},
 			handleClick(e) {
-				console.log(e);
-				if (!this.show) return;
-				this.$emit('click',false);
+				console.log(e)
+				if (!this.show) return
+				this.$emit('click',false)
 			},
 			handleClickCancel() {
-				this.$emit('cancel',false);
+				this.$emit('cancel',false)
 			},
 			discard(){
 				//丢弃