From 4faf20186349fc801dc55bf893d5a9d72982838b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Thu, 2 Dec 2021 22:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=20?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2=E5=95=86=E5=93=81=E7=80=91?=
 =?UTF-8?q?=E5=B8=83=E6=B5=81=E6=98=BE=E7=A4=BABUG=20=E3=80=90=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=20=E6=88=91=E7=9A=84=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=B4=BB=E5=8A=A8=E4=BF=A1=E6=81=AF=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=9B=9E=E6=98=BE=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?BUG=20=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=88=86=E7=B1=BB=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/point/shoppingMall/shoppingMall.vue | 2 +-
 pages/shop/searchList.vue                 | 4 ++--
 pages/user/my/myEventRegistrationList.vue | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/point/shoppingMall/shoppingMall.vue b/pages/point/shoppingMall/shoppingMall.vue
index b71b838..93ef7bd 100644
--- a/pages/point/shoppingMall/shoppingMall.vue
+++ b/pages/point/shoppingMall/shoppingMall.vue
@@ -147,7 +147,7 @@
 					title: '正在获取分类'
 				})
 				this.$http.get({
-					api: 'api/category/list',
+					api: 'api/category/point_category',
 					header: {
 						Authorization: this.token
 					}
diff --git a/pages/shop/searchList.vue b/pages/shop/searchList.vue
index d5febe5..213105b 100644
--- a/pages/shop/searchList.vue
+++ b/pages/shop/searchList.vue
@@ -15,7 +15,7 @@
 		<swiper :current="tab_current" @change="swiperChange" :style="{height: autoHeight}">
 			<swiper-item v-for="(tab_item, tab_index) in tab_list" :key="tab_index">
 				<scroll-view :scroll-y="true" :style="{height: autoHeight}" @scrolltolower="scrolltolower">
-					<view class="scroll-content" v-if="tab_index == 0">
+					<view v-if="tab_index == 0">
 						<shop-list :list="goods_list" ref="searchWaterfall"></shop-list>
 						<!-- <lf-nocontent src="/static/images/empty.png" v-if="goods_list.length <= 0"></lf-nocontent> -->
 					</view>
@@ -208,7 +208,7 @@
 		.shop-img{
 			width: 100rpx;
 			height: 100rpx;
-			background-color: #EEEEEE;
+			// background-color: #EEEEEE;
 			border-radius: 5rpx;
 			margin-right: 15rpx;
 		}
diff --git a/pages/user/my/myEventRegistrationList.vue b/pages/user/my/myEventRegistrationList.vue
index e41c250..a2851e2 100644
--- a/pages/user/my/myEventRegistrationList.vue
+++ b/pages/user/my/myEventRegistrationList.vue
@@ -85,6 +85,7 @@
 		},
 		methods: {
 			goDetails(item) {
+				if(!this.$isRight(item.activity)) return;
 				if(item.activity.is_expired) {
 					this.$msg('该活动已过期!');
 				}else {