From fd8aedab01503c37f637c5908cf3120dc0897213 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Mon, 19 Jul 2021 17:52:32 +0800
Subject: [PATCH] 首页、商品详情页等界面优化

---
 components/goods_list/goods_list.wxml |  8 ++++----
 components/goods_list/goods_list.wxss | 29 +++++++++++++++++++++--------
 pages/cart/cart/cart.wxss             | 19 +++++++++++++++----
 pages/goods/goodsInfo/goodsInfo.wxss  | 16 +++++++++++-----
 pages/index/index/index.wxml          | 18 +++++++++---------
 pages/index/index/index.wxss          |  4 ++--
 pages/team/team_show/team_show.wxss   | 20 +++++++++++++++++---
 7 files changed, 79 insertions(+), 35 deletions(-)

diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 1f78148..f1f109e 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -23,7 +23,7 @@
 							        <view class="fs35">{{item.prom_price}}</view>
 							      </view>
 							    </view>
-							    <view class="flex" style="line-height: 28rpx;">
+							    <view class="flex">
 							      <!-- 原价 -->
 							      <view class="price flex xc-ash line_th">
 							        <view class="fs22">￥</view>
@@ -51,7 +51,7 @@
                       </view>
                     </view>
                   </view>
-                  <view class="flex" style="line-height: 28rpx;">
+                  <view class="flex">
                     <!-- 原价 -->
                     <view class="price flex xc-ash line_th">
                       <view class="fs22">￥</view>
@@ -67,7 +67,7 @@
                       <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
                     </view>
                   </view>
-                  <view class="flex" style="line-height: 28rpx;">
+                  <view class="flex">
                     <!-- 原价 -->
                     <view class="price flex xc-ash line_th">
                       <view class="fs22">￥</view>
@@ -111,7 +111,7 @@
                       <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
                     </view>
                   </view>
-                  <view class="flex" style="line-height: 28rpx;">
+                  <view class="flex">
                     <!-- 原价 -->
                     <view class="price flex xc-ash line_th">
                       <view class="fs22">￥</view>
diff --git a/components/goods_list/goods_list.wxss b/components/goods_list/goods_list.wxss
index fe35283..4722ef3 100644
--- a/components/goods_list/goods_list.wxss
+++ b/components/goods_list/goods_list.wxss
@@ -86,33 +86,46 @@
 
 .goods_name {
   height: 62rpx;
-  margin-top: 6rpx;
+  /* margin-top: 6rpx; */
   line-height: 30rpx;
 }
 
 .hang {
-  width: 100%;
-  margin: auto;
-  padding-left: 21rpx;
+ /* width: 100%; */
+  /* margin: auto;
+  padding-left: 21rpx; */
+	display: flex;
+	flex-wrap: wrap;
+	/* margin: 0 auto; */
+	padding: 0 20rpx;
+	box-sizing: border-box;
+	/* justify-content: space-evenly; */
 }
 
 .hang .collect {
-  width: 347rpx;
+  width: calc((100% - 20rpx) / 2);
   /* height: 520rpx; */
   border-radius: 25rpx;
   border: 2rpx solid #ebedf0;
   overflow: hidden;
-  margin-right: 14rpx;
-  margin-bottom: 5rpx;
+	box-sizing: border-box;
+	margin-top: 20rpx;
+  /* margin-right: 14rpx;
+  margin-bottom: 5rpx; */
+}
+
+.hang .collect:nth-child(2n+1) {
+	margin-right: 20rpx;
 }
 
 .collect .bottom {
-  padding: 0rpx 20rpx 20rpx;
+  padding: 20rpx;
 }
 
 .collect .sp {
   width: 100%;
   height: 340rpx;
+	display: block;
 }
 
 .collect .money {
diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss
index 633ef3d..c792aeb 100644
--- a/pages/cart/cart/cart.wxss
+++ b/pages/cart/cart/cart.wxss
@@ -104,7 +104,7 @@ radio {
 .count {
   display: flex;
   bottom: 5rpx;
-  border: 2rpx solid rgb(236, 236, 236);
+  /* border: 2rpx solid rgb(236, 236, 236); */
   margin-bottom: 3rpx;
 }
 
@@ -129,12 +129,23 @@ radio {
   font-size: 32rpx;
 }
 
-.sub {
-  border-right: 2rpx solid rgb(236, 236, 236);
+.sub, .add, .count>input {
+    /* border-right: 1px solid #000; */
+	background-color: #f8f8f8;
+	border-radius: 8rpx;
+}
+.sub.active {
+	/* background-color: #ddd; */
+	color: #ccc;
+}
+.count>input {
+	margin: 0 10rpx;
+	line-height: normal;
 }
 
 .add {
-  border-left: 2rpx solid rgb(236, 236, 236);
+	/* background-color: #f8f8f8; */
+    /* border-left: 1px solid #000; */
 }
 
 .pay-for {
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 066d862..0eafbf4 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -626,7 +626,7 @@ border-radius: 0 56rpx 55rpx 0;
     /* position: fixed; */
     display: flex;
     height: 50rpx;
-    border: 1rpx solid #000;
+    /* border: 1rpx solid #000; */
     font-size: 28rpx;
     right: 30rpx;
 }
@@ -643,16 +643,22 @@ border-radius: 0 56rpx 55rpx 0;
   border-radius:30rpx;font-size: 24rpx;border: 1rpx solid #ccc; margin: 10rpx; height: 40rpx; line-height: 40rpx;
 }
 .spec_bt.act{background: #d60021;color: #fff;border: 1rpx solid #d60021;}
-.sub {
-    border-right: 1px solid #000;
+.sub, .add, .count>input {
+    /* border-right: 1px solid #000; */
+	background-color: #f8f8f8;
+	border-radius: 8rpx;
 }
 .sub.active {
 	/* background-color: #ddd; */
 	color: #ccc;
 }
+.count>input {
+	margin: 0 10rpx;
+}
 
 .add {
-    border-left: 1px solid #000;
+	/* background-color: #f8f8f8; */
+    /* border-left: 1px solid #000; */
 }
 
 .spec-btn {
@@ -2167,7 +2173,7 @@ padding-left:24rpx;
 
  .xc-linellae-frame{
   width: 100%;
-  height: 80rpx;
+  height: 70rpx;
   background: #f2f2f2;
 }
 .xc-linellae-frame .xc-linellae{
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 0839e41..31f4f20 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -90,25 +90,25 @@
         </navigator>
       </view> -->
       <view class="venues_item">
-        <navigator url="/packageA/pages/jfbuy/jfbuy">
+        <navigator url="/packageA/pages/jfbuy/jfbuy" hover-class="none">
           <image src="{{url}}/miniapp/images/index/jifen.png"></image>
           <view>积分购</view>
         </navigator>
       </view>
       <view class="venues_item" wx:if="{{is_closecoupon!=1}}">
-        <navigator url="/packageA/pages/quan_list/quan_list">
+        <navigator url="/packageA/pages/quan_list/quan_list" hover-class="none">
           <image src="{{url}}/miniapp/images/index/youhui.png"></image>
           <view>优惠券</view>
         </navigator>
       </view>
       <view class="venues_item">
-        <navigator url="/packageA/pages/checkin/checkin">
+        <navigator url="/packageA/pages/checkin/checkin" hover-class="none">
           <image src="{{url}}/miniapp/images/index/qiandao.png"></image>
           <view>签到</view>
         </navigator>
       </view>
       <view class="venues_item">
-        <navigator  bindtap="go_url"  data-url="/pages/goods/categoryList/categoryList">
+        <navigator  bindtap="go_url"  data-url="/pages/goods/categoryList/categoryList" hover-class="none">
           <image src="{{url}}/miniapp/images/index/fenlei.png"></image>
           <view>全部分类</view>
         </navigator>
@@ -122,14 +122,14 @@
       <view class="circle xc-class-frame t-c">
         <image class="xc-class-img" src="{{item.icoimg==null||item.icoimg==''?(item.image?url+item.image:url+'/miniapp/images/no_cate_def.png'):item.icoimg}}" 
 		   binderror="bind_bnerr_icon" data-err="gd_category[{{index}}].icon"></image>
-        <view class="fs26 gonju ellipsis-1"><text>{{item.name}}</text></view>
+        <view class="fs24 gonju ellipsis-1"><text>{{item.name}}</text></view>
       </view>
     </view>
   </view>
   <!-- 轮播 -->
   <block wx:if="{{swiperimage.length>0}}">
 	<!-- <swiper class="swiper" autoplay="true" interval="5000" circular="{{true}}" indicator-dots="{{true}}" indicator-active-color="rgb(255,255,255)" vertical> -->
-  <swiper class="swiper" autoplay="true" interval="5000" circular="{{true}}" easing-function="easeInOutCubic">
+  <swiper class="swiper" indicator-dots indicator-active-color="#fff" autoplay="true" interval="3000" circular="{{true}}" easing-function="easeInOutCubic">
     <!-- 活动轮播 -->
     <block wx:for="{{swiperimage}}" wx:for-item="adver" wx:for-index="key">
       <swiper-item>
@@ -153,7 +153,7 @@
 					<image class="seckill-ttitle-img height" src="{{url}}/miniapp/images/seckill-ttitle.png"></image>
 				</view>
 				<view class="flex ai_c seckill-list">
-					<text class="fs26 xc-marfin-right">查看全部</text>
+					<text class="fs24 xc-marfin-right">查看全部</text>
 					<image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image>
 				</view>
 			</view>
@@ -169,7 +169,7 @@
 							<image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image>
 							<image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image>
 						</view>
-						<view class="ellipsis-1 mar-top10">{{aitem.title}}</view>
+						<view class="ellipsis-2 mar-top10" style="height: 70rpx;">{{aitem.title}}</view>
 						<!-- <view class="red-co mar-top10 is_seckill_height"> -->
 						<view class="co-red mar-top10">
 							<text class="fs20">￥</text>{{aitem.price}}
@@ -202,7 +202,7 @@
           </block>
         </view>
         <view class="flex ai_c seckill-list">
-          <text class="fs26 xc-marfin-right">查看全部</text>
+          <text class="fs24 xc-marfin-right">查看全部</text>
           <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image>
         </view>
       </view>
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index 18f3896..374049c 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -86,7 +86,7 @@
 
 .s_prom {
 	width: 100%;
-	height: 326rpx;
+	height: 346rpx;
 }
 
 .s_proms {
@@ -289,7 +289,7 @@
 	/* padding: 0 10rpx;
 	line-height: 33rpx; */
 	overflow: hidden;
-	font-size: 32rpx;
+	font-size: 26rpx;
 	width: 200rpx;
 }
 
diff --git a/pages/team/team_show/team_show.wxss b/pages/team/team_show/team_show.wxss
index 4cb8702..1dedb91 100644
--- a/pages/team/team_show/team_show.wxss
+++ b/pages/team/team_show/team_show.wxss
@@ -1334,7 +1334,7 @@ page {
 	/* position: fixed; */
 	display: flex;
 	height: 50rpx;
-	border: 1rpx solid #000;
+	/* border: 1rpx solid #000; */
 	font-size: 28rpx;
 	/* right: 30rpx; */
 	/* justify-content: space-between; */
@@ -1369,13 +1369,27 @@ page {
 	border: 1rpx solid #d60021;
 }
 
-.sub {
+.sub, .add, .count>input {
+    /* border-right: 1px solid #000; */
+	background-color: #f8f8f8;
+	border-radius: 8rpx;
+}
+.sub.active {
+	/* background-color: #ddd; */
+	color: #ccc;
+}
+.count>input {
+	margin: 0 10rpx;
+	line-height: normal;
+}
+
+/* .sub {
 	border-right: 1px solid #000;
 }
 
 .add {
 	border-left: 1px solid #000;
-}
+} */
 
 .spec-btn {
 	color: black;
--
libgit2 0.21.4