diff --git a/components/shop/list/index.vue b/components/shop/list/index.vue
index 3f8907e..f53731a 100644
--- a/components/shop/list/index.vue
+++ b/components/shop/list/index.vue
@@ -93,8 +93,8 @@ export default {
 		},
 		setSwiperHeight() {
 			// height: 230px, margin-bottom: 13
-			const height = Math.ceil(this.goodsList.length / 2) * (230 + 13);
-			this.swiperHeight = height == 0 ? '230px' : height + 'px';
+			const height = Math.ceil(this.goodsList.length / 2) * (510 + 26);
+			this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
 		},
 		// tabs通知swiper切换
 		tabsChange(index) {
diff --git a/components/shop/list/item.vue b/components/shop/list/item.vue
index 9767e42..329a98e 100644
--- a/components/shop/list/item.vue
+++ b/components/shop/list/item.vue
@@ -44,6 +44,7 @@ export default {
 <style lang="scss" scoped>
 .item{
     width: 330rpx;
+	height: 510rpx;
     margin-bottom: 26rpx;
     background-color: #f8f8f8;
     border-radius: 10rpx 10rpx 0rpx 0rpx;
diff --git a/pageE/mine/ImageTextCollection.vue b/pageE/mine/ImageTextCollection.vue
index f9a268d..56da1ee 100644
--- a/pageE/mine/ImageTextCollection.vue
+++ b/pageE/mine/ImageTextCollection.vue
@@ -1,34 +1,38 @@
 <template>
 	<view class="collection">
-		<view class="item-box" v-for="(item, index) in articleList" :key="index">
-			 <view class="video-item" v-if="item">
-				<image class="head" :src="item.article_pic" v-if="item.type == 1"></image>
-				<view class="header_fist" v-else>
-					<view class="backes"></view>
-					<image class="head" :src="item.article_pic" @click="toDetailsPage(item.article_id)"></image>
-				</view>
-				<view class="title">{{ item.article_title }}</view>
-				<view class="jianjie">{{ item.article_content }}</view>
-				<view class="user">
-					<view class="info">
-						<image :src="item.member_avatar"></image>
-						<text>{{ item.member_nickname }}</text>
+		<view class="container">
+			<view class="item-box" v-for="(item, index) in articleList" :key="index" @click="toDetailsPage(item.article_id)">
+				<view class="video-item" v-if="item">
+					<image class="head" :src="item.article_pic" v-if="item.type == 1"></image>
+					<view class="header_fist" v-else>
+						<view class="backes"></view>
+						<image class="head" :src="item.article_pic"></image>
 					</view>
-				 	<u-icon name="trash" color="#333" size="36" @click="delArticle(item.article_id)"></u-icon>
-					<!-- <image src="/static/image/common/4.png" @click.stop="showAction(item)"></image> -->
-					<!-- <view class="action" v-if="show == item.article_id">
-						<view class="bubble">
-							<view @click.stop="delArticle(item.article_id)">
-								<image src="/static/image/common/8.png"></image>
-								<text>删除</text>
-							</view>
+					<view class="title u-line-1">{{ item.article_title }}</view>
+					<view class="jianjie u-line-1">{{ item.article_content }}</view>
+					<view class="user">
+						<view class="info">
+							<image :src="item.member_avatar"></image>
+							<text>{{ item.member_nickname }}</text>
 						</view>
-					</view> -->
-					<view class="layer" v-if="show == item.article_id" @click.stop="show=-1"></view>
+						<view @click.stop="delArticle(item.article_id)">
+							<u-icon name="trash" color="#333" size="36"></u-icon>
+						</view>
+						<!-- <image src="/static/image/common/4.png" @click.stop="showAction(item)"></image> -->
+						<!-- <view class="action" v-if="show == item.article_id">
+							<view class="bubble">
+								<view @click.stop="delArticle(item.article_id)">
+									<image src="/static/image/common/8.png"></image>
+									<text>删除</text>
+								</view>
+							</view>
+						</view> -->
+						<view class="layer" v-if="show == item.article_id" @click.stop="show=-1"></view>
+					</view>
 				</view>
 			</view>
 		</view>
-		<u-empty mode="list" v-if="!articleList.length" color="#000" img-width="200" font-size="30" style="margin: 20vh auto 0;"></u-empty>
+		<u-empty mode="list" v-if="!articleList.length" color="#000" img-width="200" font-size="30" margin-top="120"></u-empty>
 	</view>
 </template>
 <script>
@@ -79,159 +83,151 @@ export default {
 </script>
 <style lang="scss" scoped>
 .collection {
-	border-top: 1rpx solid #ECECEC;
-	padding: 21rpx 30rpx 0;
-	display: flex;
-	flex-wrap: wrap;
-	.item-box {
-		&:not(:nth-child(2n)) {
-			margin-right: 20rpx;
-		}
-		.video-item{
-			height: 540rpx;
-			margin-top: 20rpx;
-			width: 335rpx;
-			box-shadow:0 3rpx 7rpx 0 rgba(153, 153, 153, 0.35);
-			padding-bottom: 20rpx;
-			border-radius: 20rpx;
-			overflow: hidden;
-			.head{
-				width: 100%;
-				height: 334rpx;
+	.container {
+		border-top: 1rpx solid #ECECEC;
+		padding: 21rpx 30rpx 0;
+		display: flex;
+		flex-wrap: wrap;
+		.item-box {
+			&:not(:nth-child(2n)) {
+				margin-right: 20rpx;
 			}
-			.title{
-				margin:0 auto;
+			.video-item{
+				height: 540rpx;
 				margin-top: 20rpx;
-				font-size: 22rpx;
-				color: #333;
-				font-weight: 500;
-				line-height: 30rpx;
-				width: 300rpx;
-				overflow:hidden; 
-				text-overflow:ellipsis;
-				display:-webkit-box; 
-				-webkit-box-orient:vertical;
-				-webkit-line-clamp:2; 
-			}
-			.jianjie{
-				height: 60rpx;
-				margin:0 auto;
-				margin-top: 20rpx;
-				font-size: 22rpx;
-				color: #666;
-				line-height: 30rpx;
-				width: 300rpx;
-				margin-left: 18rpx;
-				overflow:hidden; 
-				text-overflow:ellipsis;
-				display:-webkit-box; 
-				-webkit-box-orient:vertical;
-				-webkit-line-clamp:2; 
-			}
-			.user{
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin:0 auto;
-				margin-top: 20rpx;
-				width: 300rpx;
-				position: relative;
-				.info {
+				width: 335rpx;
+				box-shadow:0 3rpx 7rpx 0 rgba(153, 153, 153, 0.35);
+				padding-bottom: 20rpx;
+				border-radius: 20rpx;
+				overflow: hidden;
+				.head{
+					width: 100%;
+					height: 334rpx;
+				}
+				.title{
+					margin:0 auto;
+					margin-top: 20rpx;
+					font-size: 22rpx;
+					color: #333;
+					font-weight: 500;
+					line-height: 30rpx;
+					width: 300rpx;
+				}
+				.jianjie{
+					// height: 60rpx;
+					margin:0 auto;
+					margin-top: 20rpx;
+					font-size: 22rpx;
+					color: #666;
+					line-height: 30rpx;
+					width: 300rpx;
+					margin-left: 18rpx;
+				}
+				.user{
 					display: flex;
+					justify-content: space-between;
 					align-items: center;
-					>image{
-						width: 38rpx;
-						height: 38rpx;
-						border-radius: 50%;
+					margin:0 auto;
+					margin-top: 20rpx;
+					width: 300rpx;
+					position: relative;
+					.info {
+						display: flex;
+						align-items: center;
+						>image{
+							width: 38rpx;
+							height: 38rpx;
+							border-radius: 50%;
 
-					}
-					>text{
-						font-size: 20rpx;
-						color:#333;
-						margin-left: 9rpx;
-					}
-				}
-				>image{
-					width: 37rpx;
-					height: 8rpx;
-				}
-				.action {
-					z-index: 19;
-					position: absolute;
-					right: 0rpx;
-					bottom: 55rpx;
-					// width: 234rpx;
-					background: rgba(255,255,255,1);
-					box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
-					border-radius: 6rpx;
-					.bubble {
-						position: relative;
-						background-color: #fff;
-						&::after {
-							position: absolute;
-							right: 10rpx;
-							bottom: 0;
-							content: '';
-							width: 60rpx; 
-							height: 40rpx;
-							background-color: inherit;
-							transform: rotate(45deg);
-							margin-top: -10rpx;
-							z-index: -1;
-							box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
 						}
-						> view {
-							padding: 9rpx 12rpx;
-							display: flex;
-							align-items: center;
-							&:not(:last-child) {
-								border-bottom: 2rpx #ECECEC solid;
+						>text{
+							font-size: 20rpx;
+							color:#333;
+							margin-left: 9rpx;
+						}
+					}
+					>image{
+						width: 37rpx;
+						height: 8rpx;
+					}
+					.action {
+						z-index: 19;
+						position: absolute;
+						right: 0rpx;
+						bottom: 55rpx;
+						// width: 234rpx;
+						background: rgba(255,255,255,1);
+						box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
+						border-radius: 6rpx;
+						.bubble {
+							position: relative;
+							background-color: #fff;
+							&::after {
+								position: absolute;
+								right: 10rpx;
+								bottom: 0;
+								content: '';
+								width: 60rpx; 
+								height: 40rpx;
+								background-color: inherit;
+								transform: rotate(45deg);
+								margin-top: -10rpx;
+								z-index: -1;
+								box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
 							}
-							@mixin image-class($width, $height, $right) {
-								width: $width;
-								height: $height;
-								margin-right: $right;
-							}
-							> image {
-								&:first-child {
-									@include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx);
+							> view {
+								padding: 9rpx 12rpx;
+								display: flex;
+								align-items: center;
+								&:not(:last-child) {
+									border-bottom: 2rpx #ECECEC solid;
 								}
-								&:nth-child(2) {
-									@include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx);
+								@mixin image-class($width, $height, $right) {
+									width: $width;
+									height: $height;
+									margin-right: $right;
 								}
-								&:last-child {
-									@include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx);
+								> image {
+									&:first-child {
+										@include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx);
+									}
+									&:nth-child(2) {
+										@include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx);
+									}
+									&:last-child {
+										@include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx);
+									}
+								}
+								> text {
+									font-size: 20rpx;
+									color: rgba(51,51,51,1);
 								}
-							}
-							> text {
-								font-size: 20rpx;
-								color: rgba(51,51,51,1);
 							}
 						}
 					}
+					.layer {
+						position: fixed;
+						top: 0;
+						left: 0;
+						width: 100%;
+						height: 100%;
+						z-index: 9;
+						background-color: transparent;
+					}
 				}
-				.layer {
-					position: fixed;
-					top: 0;
-					left: 0;
-					width: 100%;
-					height: 100%;
-					z-index: 9;
-					background-color: transparent;
+				.header_fist{
+					position: relative;
+					.backes{
+						position: absolute;
+						top: 0;
+						background: rgba(0,0,0,0.6);
+						width: 100%;
+						height: 100%;
+						color: #fff;
+					}
+					
 				}
 			}
-			.header_fist{
-				position: relative;
-				.backes{
-					position: absolute;
-					top: 0;
-					background: rgba(0,0,0,0.6);
-					width: 100%;
-					height: 100%;
-					color: #fff;
-				}
-				
-			}
 		}
 	}
 }
diff --git a/pageE/mine/MineConcerns.vue b/pageE/mine/MineConcerns.vue
index bf555f2..8822db3 100644
--- a/pageE/mine/MineConcerns.vue
+++ b/pageE/mine/MineConcerns.vue
@@ -2,16 +2,14 @@
 	<view class="concerns">
 		<view class="concerns-container">
 			<view v-for="(info, index) in list" :key="index">
-				<view class="daren-item" @click="toDetailsPage">
+				<view class="daren-item">
 					<image class="head" :src="info.friend_tomavatar"></image>
-					<text class="name">{{ info.friend_tomname }}</text>
-					<!-- <text class="zhuangtai">状态: {{ info.live_status == 1 ? '正在直播' : '未开播' }}</text> -->
-					<view class="guanzhu" @click="changeType(info.friend_frommid)" v-if="info.friend_followstate == 1">关注</view>
-					<view class="guanzhu action" @click="changeType(info.friend_frommid)" v-else>未关注</view>
+					<text class="name">{{ info.friend_tomname || '' }}</text>
+					<view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view>
 				</view>
 			</view>
-			<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" style="margin: 20vh auto 0;"></u-empty>
 		</view>
+		<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="120"></u-empty>
 	</view>
 </template>
 <script>
@@ -24,16 +22,30 @@ export default {
 	onShow() {
 		this.attentionMemberList();
 	},
+	// 下拉刷新
+	onPullDownRefresh() {
+        this.attentionMemberList();
+    },
 	methods: {
 		attentionMemberList() {
 			this.$u.api.attentionMemberList().then(res => {
+				uni.stopPullDownRefresh();
 				if(res.errCode == 0) {
 					this.list = res.data;
 				} else {
 					this.list = [];
 				}
 			})
-		}
+		},
+		changeType(id) {
+				console.log(id);
+				this.$u.api.attentionMember({
+					member_id: id
+				}).then(res => {
+					this.$u.toast(res.message);
+					this.attentionMemberList();
+				})
+			},
 	},
 };
 </script>
@@ -76,7 +88,7 @@ export default {
 			.guanzhu{
 				width: 130rpx;
 				height: 50rpx;
-				background-color: #FF780F;
+				background-color: #EDEDED;
 				font-size: 26rpx;
 				line-height: 50rpx;
 				color: #fff;
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index dd38fa4..0e3c923 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -19,14 +19,14 @@
 				<view class="member-service" @click="toOtherPage('/mine/MemberServe')">会员服务</view>
 			</view>
 			<view class="bottom">
-				<view @click="toOtherPage('/mine/GoodsCollection')">
+				<!-- <view @click="toOtherPage('/mine/GoodsCollection')">
 					<view>{{ userInfo.member_fav_goods_num || 0 }}</view>
 					<view>商品收藏</view>
 				</view>
 				<view @click="toOtherPage('/mine/StoreCollection')">
 					<view>{{ userInfo.member_fav_store_num || 0 }}</view>
 					<view>店铺收藏</view>
-				</view>
+				</view> -->
 				<view @click="toOtherPage('/mine/ImageTextCollection')">
 					<view>{{ userInfo.member_fav_article_num || 0 }}</view>
 					<view>图文收藏</view>
@@ -248,8 +248,10 @@ export default {
 			box-sizing: border-box;
 			padding: 0 30rpx;
 			display: flex;
-			justify-content: space-between;
+			// justify-content: space-between;
+			justify-content: flex-start;
 			> view {
+				margin-right: 80rpx;
 				text-align: center;
 				font-size: 24rpx;
 				color:rgba(51,51,51,1);