From cf13cff9f3629049cd3525a330c23d1fd1524697 Mon Sep 17 00:00:00 2001
From: Shuixiang <mr.shuixiang@aliyun.com>
Date: Mon, 11 Oct 2021 17:09:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=AD=94=E6=96=B9=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index 4117356..52a10d7 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -44,7 +44,7 @@
 						<lf-seckill :list="item.value" :title="item.title"></lf-seckill>
 					</view>
 					<!-- 广告活动模块，根据旧版魔方修改,三张图 -->
-					<view v-if="item.name == 'micro_page_componet_cube' && item.value && item.value.length && item.type == '3_2'">
+					<view v-if="item.name == 'micro_page_componet_cube' && item.value && item.value.length && (item.type == '3_1' || item.type == '3_2' || item.type == '3_3')">
 						<lf-multi-column-ad :cube-data="item.value"></lf-multi-column-ad>
 					</view>
 					<!-- 首页发现推荐模块 -->

From b01bfc02c4d02c927588bf7fde45a4628842a4bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Mon, 11 Oct 2021 17:24:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B7=91=E9=A9=AC=E7=81=AF=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=95=86=E5=AE=B6=E4=B8=AD=E5=BF=83=E6=89=AB=E7=A0=81=E6=A0=B8?=
 =?UTF-8?q?=E9=94=80=E6=8F=90=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/business/center/center.vue              | 24 +++++++++++++------
 .../u-column-notice/u-column-notice.vue       |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pages/business/center/center.vue b/pages/business/center/center.vue
index a7382a6..95e1e24 100644
--- a/pages/business/center/center.vue
+++ b/pages/business/center/center.vue
@@ -22,8 +22,9 @@
 					</view>
 				</view>
 			</view>
-			<view class="notice" v-if="detail.notice.length">
-				<u-notice-bar mode="vertical" type="none" :list="detail.notice"></u-notice-bar>
+			<view class="notice">
+				<!-- <u-notice-bar mode="vertical" type="none" :volume-icon="false" :list="detail.notice"></u-notice-bar> -->
+				<u-notice-bar type="none" :volume-icon="false" mode="vertical" :list="detail.notice"></u-notice-bar>
 			</view>
 			<view class="card">
 				<view class="lf-row-between">
@@ -146,7 +147,8 @@
 				}).then(res => {
 					console.log("getStoreCenter", res);
 					if(res.data.code == 200){
-						this.detail = res.data.data;
+						let detail = res.data.data;
+						this.detail = detail;
 					}else{
 						this.$msg('您的状态异常，请重新登录').then(() => {
 							this.$url('/pages/business/login/login', {type: 'redirect'});
@@ -204,7 +206,11 @@
 						token: this.token
 					}
 				}).then(res => {
-					this.$msg(res.data.message || '核销失败');
+					uni.showModal({
+						title: '',
+						content: res.data.message || '核销失败',
+						showCancel: false
+					})
 				})
 			},
 			// 自提
@@ -218,7 +224,11 @@
 						token: this.token
 					}
 				}).then(res => {
-					this.$msg(res.data.message || '自提核销成功');
+					uni.showModal({
+						title: '',
+						content: res.data.message || '自提核销成功',
+						showCancel: false
+					})
 				})
 			},
 			// 退出登录
@@ -311,14 +321,14 @@
 	
 	.notice{
 		width: 686rpx;
-		height: 100rpx;
+		// height: 100rpx;
 		background: #FFFFFF;
 		box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
 		border-radius: 20rpx;
 		margin: -50rpx auto 0;
 		position: relative;
 		z-index: 9;
-		padding: 16rpx 4rpx 0;
+		padding: 16rpx 4rpx;
 		box-sizing: border-box;
 	}
 	
diff --git a/uview-ui/components/u-column-notice/u-column-notice.vue b/uview-ui/components/u-column-notice/u-column-notice.vue
index f3d158a..33dc918 100644
--- a/uview-ui/components/u-column-notice/u-column-notice.vue
+++ b/uview-ui/components/u-column-notice/u-column-notice.vue
@@ -14,7 +14,7 @@
 			<swiper-item v-for="(item, index) in list" :key="index" class="u-swiper-item">
 				<view class="u-news-item u-line-1" :style="[textStyle]" @tap="click(index,item)"
 					:class="['u-type-' + type]">
-					{{ item.associate.title }}
+					{{ item.associate.title || item }}
 				</view>
 			</swiper-item>
 		</swiper>