From ef4a4010ff4cae6cfce28b7528c5ae89694b7cc4 Mon Sep 17 00:00:00 2001
From: Niujiawei <niujiawei>
Date: Tue, 4 Aug 2020 22:34:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F2020.0804?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/index/daren-item/index.vue | 5 +++--
 components/index/video-item/index.vue | 4 ++--
 components/shop/list/index.vue        | 5 +++--
 components/shop/list/item.vue         | 5 +++--
 pageB/photo/index.vue                 | 5 +++--
 pages/shop/index.vue                  | 3 ++-
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/components/index/daren-item/index.vue b/components/index/daren-item/index.vue
index 9be9405..98b26a2 100644
--- a/components/index/daren-item/index.vue
+++ b/components/index/daren-item/index.vue
@@ -3,8 +3,8 @@
         <image class="head" :src="info.member_avatar"></image>
         <text class="name">{{ info.member_nickname }}</text>
         <text class="zhuangtai">状态: {{ info.live_status == 1 ? '正在直播' : '未开播' }}</text>
-        <view class="guanzhu"  @tap="changeType(info.member_id)" v-if="info.is_attention == 1">关注</view>
-        <view class="guanzhu action" @tap="changeType(info.member_id)" v-else >未关注</view>
+        <view class="guanzhu action"  @tap="changeType(info.member_id)" v-if="info.is_attention == 1">已关注</view>
+        <view class="guanzhu" @tap="changeType(info.member_id)" v-else >未关注</view>
     </view>
 </template>
 <script>
@@ -80,6 +80,7 @@ export default {
     }
 	.action{
 		background: #f3f3f3;
+		color: #FF780F;
 	}
 }
 </style>
\ No newline at end of file
diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index 1de8549..3a51a76 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -50,10 +50,10 @@
     .title{
         margin:0 auto;
         margin-top: 20rpx;
-        font-size: 22rpx;
+        font-size: 28rpx;
         color: #333;
         font-weight: 500;
-        line-height: 30rpx;
+        line-height: 48rpx;
         width: 300rpx;
         overflow:hidden; 
         text-overflow:ellipsis;
diff --git a/components/shop/list/index.vue b/components/shop/list/index.vue
index 5ddc0ba..35f2e4f 100644
--- a/components/shop/list/index.vue
+++ b/components/shop/list/index.vue
@@ -93,8 +93,9 @@ export default {
 		},
 		setSwiperHeight() {
 			// height: 230px, margin-bottom: 13
-			const height = Math.ceil(this.goodsList.length / 2) * (510 + 26);
-			this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
+			// const height = Math.ceil(this.goodsList.length / 2) * (510 + 26);
+			// this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
+			this.swiperHeight = Math.ceil(this.goodsList.length / 2) * (270 + 13) + 'px';
 		},
 		// tabs通知swiper切换
 		tabsChange(index) {
diff --git a/components/shop/list/item.vue b/components/shop/list/item.vue
index 29bfdf3..be4ff0f 100644
--- a/components/shop/list/item.vue
+++ b/components/shop/list/item.vue
@@ -44,7 +44,7 @@ export default {
 <style lang="scss" scoped>
 .item{
     width: 330rpx;
-		height: 510rpx;
+	height: 510rpx;
     margin-bottom: 26rpx;
     background-color: #f8f8f8;
     border-radius: 10rpx 10rpx 0rpx 0rpx;
@@ -62,7 +62,7 @@ export default {
         flex-direction: column;
         justify-content: space-around;
         .title{
-			line-height: 34rpx;
+			line-height: 40rpx;
             font-size: 30rpx;
             color: #333;
 			margin-bottom: 13rpx;
@@ -71,6 +71,7 @@ export default {
             font-size: 26rpx;
             color: #666;
 			margin-bottom: 20rpx;
+			line-height: 38rpx;
         }
         .price{
             color: #FF3131;
diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue
index 4183d16..0e68f1d 100644
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -124,7 +124,7 @@
             font-size: 24rpx;
             color: #fff;
             border-radius: 10rpx;
-            background-color: #999;
+            background:rgba(153,153,153,.5);
             >view{
                 width: 12rpx;
                 height: 12rpx;
@@ -139,8 +139,9 @@
 
         }
         .title{
-            font-size: 26rpx;
+            font-size: 28rpx;
             color: #333;
+			line-height: 46rpx;
         }
         .info{
 			margin: 20rpx 0;
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 209350d..768a7c3 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -9,7 +9,7 @@
 					<image src="/static/image/shop/2.png"></image>
 				</view>
 				<view @click="sousuo">
-					<u-search placeholder="" v-model="keyword" :show-action="false" bg-color="#fff" border-color="#999999" :disabled="true"></u-search>
+					<u-search placeholder="输入您喜欢的宝贝" v-model="keyword" :show-action="false" bg-color="#fff" border-color="#999999" :disabled="true"></u-search>
 				</view>
 				<image src="/static/image/shop/3.png" class="mnue" @click="toClassifyPage"></image>
 			</view>
@@ -234,6 +234,7 @@
 			height: 88rpx;
 			display: flex;
 			align-items: center;
+			justify-content: space-between;
 
 			.local {
 				width: 31rpx;