From 361e9a76fd9e21eb3e3270295319680e14771967 Mon Sep 17 00:00:00 2001
From: Niujiawei <niujiawei>
Date: Wed, 5 Aug 2020 21:39:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=AD=89=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/index/video-item/index.vue | 6 +++---
 components/shop/group/index.vue       | 6 +++---
 components/shop/group/item.vue        | 6 +++---
 components/shop/recommend/pintuan.vue | 2 +-
 components/shop/shop-item/index.vue   | 2 +-
 components/shop/youhq/index.vue       | 4 ++--
 pageA/login/login.vue                 | 3 ++-
 pages.json                            | 2 +-
 pages/shop/index.vue                  | 4 ++--
 9 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index 3a51a76..18b0ae4 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -49,11 +49,11 @@
     }
     .title{
         margin:0 auto;
-        margin-top: 20rpx;
+        margin-top: 4rpx;
         font-size: 28rpx;
         color: #333;
         font-weight: 500;
-        line-height: 48rpx;
+        line-height: 40rpx;
         width: 300rpx;
         overflow:hidden; 
         text-overflow:ellipsis;
@@ -63,7 +63,7 @@
     }
     .jianjie{
         margin:0 auto;
-        margin-top: 20rpx;
+        margin-top: 10rpx;
         font-size: 22rpx;
         color: #666;
         line-height: 30rpx;
diff --git a/components/shop/group/index.vue b/components/shop/group/index.vue
index 5c69287..c73beff 100644
--- a/components/shop/group/index.vue
+++ b/components/shop/group/index.vue
@@ -5,9 +5,9 @@
             <text @click="viewMore">查看更多></text>
         </view>
         <view class="label">
-            <u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="88"></u-tabs-swiper>
+            <u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper>
         </view>
-		<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 130px">
+		<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 168px">
 			<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
 				<!-- 最多显示3个 -->
 				<sitem :info="info" v-for="(info, index) in groupList.slice(0, 3)" :key="index"></sitem>
@@ -79,7 +79,7 @@ export default {
 	background-color: #ffffff;
     .top {
 		padding: 0 30rpx;
-        height: 90rpx;
+        height:80rpx;
         width: 100%;
         display: flex;
         align-items: center;
diff --git a/components/shop/group/item.vue b/components/shop/group/item.vue
index 141f0e9..8479758 100644
--- a/components/shop/group/item.vue
+++ b/components/shop/group/item.vue
@@ -47,8 +47,8 @@ export default {
     width: 210rpx;
 	overflow: hidden;
     .head{
-        width: 210rpx;
-        height: 131rpx;
+        width: 100%;
+        height: 180rpx;
         border-radius: 6rpx;
     }
     .title{
@@ -66,7 +66,7 @@ export default {
         > view:first-child{
             font-size: 26rpx;
             color: #FF3131;
-			margin-bottom: 4rpx;
+			margin-bottom: 12rpx;
         }
         > view:last-child{
 			font-size: 22rpx;
diff --git a/components/shop/recommend/pintuan.vue b/components/shop/recommend/pintuan.vue
index 677c560..c72d9db 100644
--- a/components/shop/recommend/pintuan.vue
+++ b/components/shop/recommend/pintuan.vue
@@ -85,7 +85,7 @@ export default {
         }
     }
     .connect{
-		padding: 30rpx;
+		padding:10rpx 30rpx 30rpx;
         display: flex;
 		align-items: center;
         .user {
diff --git a/components/shop/shop-item/index.vue b/components/shop/shop-item/index.vue
index 4cdc45f..d78eb13 100644
--- a/components/shop/shop-item/index.vue
+++ b/components/shop/shop-item/index.vue
@@ -26,7 +26,7 @@ export default {
     align-items: center;
     flex-direction: column;
     width: 20%;
-    margin-bottom: 20rpx;
+    margin-bottom:34rpx;
     >image{
         width: 80rpx;
         height: 80rpx;
diff --git a/components/shop/youhq/index.vue b/components/shop/youhq/index.vue
index 4c9baa3..bb5d182 100644
--- a/components/shop/youhq/index.vue
+++ b/components/shop/youhq/index.vue
@@ -4,7 +4,7 @@
 			<view class="title">全部优惠券</view>
 			<view class="view-more" @click="toCouponPage">查看更多></view>
 		</view>
-		<u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="88" ></u-tabs-swiper>
+		<u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="60" ></u-tabs-swiper>
 		 <!-- :style="{ height: swiperHeight }" -->
 		<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
@@ -97,7 +97,7 @@ export default {
 	margin-bottom: 40rpx;
 	.top {
 		padding: 0 30rpx;
-		height: 90rpx;
+		height: 80rpx;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
diff --git a/pageA/login/login.vue b/pageA/login/login.vue
index 5a10a1f..21c6b99 100644
--- a/pageA/login/login.vue
+++ b/pageA/login/login.vue
@@ -20,7 +20,7 @@
 				<!-- 服务协议 -->
 				<view class="pact">
 					<view>
-						<view></view>
+						<view style="padding-bottom: 10px;"></view>
 						<text>我已详细阅读并同意</text>
 						<text class="pact_text" v-for="(item,index) in pact_text" :key="index" @click="pact_click(index)"> {{item.text}}
 						</text>
@@ -432,6 +432,7 @@
 		position: relative;
 		padding-left: 40rpx;
 		overflow: hidden;
+		padding-bottom:10px
 		// overflow: hidden; //超出的文本隐藏
 		// text-overflow: ellipsis; //溢出用省略号显示
 		// white-space: nowrap; //溢出不换行
diff --git a/pages.json b/pages.json
index 99adf7c..3f2de38 100644
--- a/pages.json
+++ b/pages.json
@@ -1014,7 +1014,7 @@
 	],
 	"tabBar": {
 		"color": "#999999",
-		"selectedColor": "#FFC023",
+		"selectedColor": "#FF780F",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"list": [{
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 768a7c3..6b73706 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -276,7 +276,7 @@
 		}
 
 		.chengnuo {
-			padding: 30rpx;
+			padding:20rpx 30rpx;
 			background-color: #ffffff;
 			display: flex;
 			justify-content: space-between;
@@ -302,7 +302,7 @@
 		.fenlei {
 			display: flex;
 			flex-wrap: wrap;
-      padding: 30rpx;
+			padding: 10rpx 30rpx;
 			margin-bottom: 20rpx;
 			background-color: #ffffff;
 		}

From ed0edbab2fb673cc9d83c8b656a1770466f081f8 Mon Sep 17 00:00:00 2001
From: Niujiawei <niujiawei>
Date: Wed, 5 Aug 2020 22:06:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=202020?=
 =?UTF-8?q?.08.05?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/shop/list/index.vue | 6 +++---
 components/shop/list/item.vue  | 2 +-
 pageC/classify/goods.vue       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/shop/list/index.vue b/components/shop/list/index.vue
index 35f2e4f..6ef068a 100644
--- a/components/shop/list/index.vue
+++ b/components/shop/list/index.vue
@@ -95,7 +95,7 @@ export default {
 			// height: 230px, margin-bottom: 13
 			// 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';
+			this.swiperHeight = Math.ceil(this.goodsList.length / 2) * (280 + 13) + 'px';
 		},
 		// tabs通知swiper切换
 		tabsChange(index) {
@@ -125,8 +125,8 @@ export default {
 	};
     .top {
         font-size: 30rpx;
-        height: 90rpx;
-        line-height: 90rpx;
+        height: 74rpx;
+        line-height: 88rpx;
         text-align: center;
         color: #333;
     }
diff --git a/components/shop/list/item.vue b/components/shop/list/item.vue
index be4ff0f..5d30f05 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: 520rpx;
     margin-bottom: 26rpx;
     background-color: #f8f8f8;
     border-radius: 10rpx 10rpx 0rpx 0rpx;
diff --git a/pageC/classify/goods.vue b/pageC/classify/goods.vue
index 4678187..10661a6 100644
--- a/pageC/classify/goods.vue
+++ b/pageC/classify/goods.vue
@@ -170,7 +170,7 @@ export default {
 			align-items: center;
 			> image {
 				width: 220rpx;
-				height: 170rpx;
+				height: 200rpx;
 				flex-shrink: 0;
 				margin-right: 30rpx;
 			}
@@ -184,7 +184,7 @@ export default {
 				.briefing {
 					font-size: 28rpx;
 					color: rgba(102,102,102,1);
-					line-height: 36rpx;
+					line-height: 42rpx;
 				}
 			}
 		}

From 1313a90d5eacade231412587e52c0ecd9c7ab850 Mon Sep 17 00:00:00 2001
From: Niujiawei <niujiawei>
Date: Wed, 5 Aug 2020 22:44:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageB/sdetails/index.vue      | 4 ++--
 pageC/cart/index.vue          | 1 +
 pageE/mine/ArticleDetails.vue | 1 +
 pages/mine/index.vue          | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index acf6c69..1edd690 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -135,14 +135,14 @@
         </u-popup>
 		<!-- 普通商品 tool -->
         <view class="tloos" v-if="type == 1">
-            <view class="navs">
+            <!-- <view class="navs">
                 <image src="/static/image/common/18.png"></image>
                 店铺
             </view>
             <view class="navs" style="margin-right:30rpx">
                 <image src="/static/image/common/19.png"></image>
                 客服
-            </view>
+            </view> -->
             <view class="button" style="background:rgba(253,211,96,0.6);" v-if="goodsInfo.goods_try == 1" @click="tryDress">试穿试送</view>
             <view class="button" style="background:rgba(253,211,96,1);" @click="addCart">加入购物车</view>
             <view class="button" style="background:rgba(255,120,15,1);" @click="settlementOrder">立即购买</view>
diff --git a/pageC/cart/index.vue b/pageC/cart/index.vue
index 66ed8a1..d88b5bc 100644
--- a/pageC/cart/index.vue
+++ b/pageC/cart/index.vue
@@ -292,6 +292,7 @@ export default {
 						.info {
 							width: 418rpx;
 							height: 160rpx;
+							line-height: 48rpx;
 							display: flex;
 							flex-direction: column;
 							justify-content: space-between;
diff --git a/pageE/mine/ArticleDetails.vue b/pageE/mine/ArticleDetails.vue
index 991f127..fb69165 100644
--- a/pageE/mine/ArticleDetails.vue
+++ b/pageE/mine/ArticleDetails.vue
@@ -58,5 +58,6 @@ export default {
 	min-height: calc(100vh - var(--window-top));
 	background: #ECECEC;
 	padding: 20rpx 35rpx 0;
+	line-height: 45rpx;
 }
 </style>
\ No newline at end of file
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 8c5f496..bb5d862 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -46,7 +46,7 @@
 				<view class="title">
 					<view class="title-text">我的订单</view>
 					<view class="more" @click="toOtherPage('/order/Index')">
-						<view>查看全部订单</view>
+						<view class="title-text">查看全部订单</view>
 						<image src="/static/image/mine/21.png"></image>
 					</view>
 				</view>
@@ -355,7 +355,7 @@ export default {
 		} 
 		.tool {
 			@include common-mine(
-				$content-padding-top: 8rpx,
+				$content-padding-top: 24rpx,
 				$content-padding-bottom: 25rpx, 
 				$image-height: 71rpx,
 				$image-width: 71rpx
@@ -368,7 +368,7 @@ export default {
 		}
 		 .more-tool {
 			@include common-mine(
-				$content-padding-top: 8rpx, 
+				$content-padding-top: 24rpx, 
 				$content-padding-bottom: 48rpx, 
 				$image-height: 71rpx,
 				$image-width: 71rpx