From 0dd9c4051eb8fa2cfb97619414be866ebbdd583d Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Tue, 29 Sep 2020 10:16:48 +0800
Subject: [PATCH] 搜索列表和等级卡样式调整

---
 pages/goods/search/g_filter.wxs |  2 +-
 pages/goods/search/search.js    |  2 +-
 pages/goods/search/search.wxml  | 23 +++++++++++++----------
 pages/goods/search/search.wxss  | 47 ++++++++++++++++++++++++++++++++++++++---------
 4 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/pages/goods/search/g_filter.wxs b/pages/goods/search/g_filter.wxs
index e998151..88f50d8 100644
--- a/pages/goods/search/g_filter.wxs
+++ b/pages/goods/search/g_filter.wxs
@@ -77,7 +77,7 @@ var g_filters = {
 				 //min_price=min.price;
 				 //min_name=min.name;				   
 			     if(type==0) return min_price.toFixed(2);	
-				 if(min_name.length>4 )	min_name=min_name.substring(0, 4);	 
+				 if(min_name.length>7 )	min_name=min_name.substring(0, 8);	 
 			     return min_name;
 		},
 }
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index f58b152..0107cbc 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -78,7 +78,7 @@ Page({
 		 			  	      //--- 判断是等级会员，且在有效期范围内 ---
 		 			  	      if(user.card_field && now<end){
 		 			  		    var card_name=ob.name_map.get(user.card_field);									
-		 						if(card_name.length>4) card_name=card_name.substring(0,4);
+		 						if(card_name.length>7) card_name=card_name.substring(0,8);
 		 			  		    th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list});				 
 		 			  	      }		
 		 			  		}
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index 270f2b9..b20374a 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -28,12 +28,12 @@
     </navigator>
   </view>
   <view class="choice_list">
-    <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
+    <navigator class="choice_item flex ai-center" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
       <view class="img-wrap">
         <image src="{{item.original_img}}" lazy-load="true" binderror="bind_bnerr" data-errorimg="requestData[{{index}}].original_img"></image>
       </view>
       <view class="item-cont">
-        <view class="title">{{item.goods_name}}</view>
+        <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价 -->
         <block wx:if="{{item.prom_price>0}}">
           <!-- 活动价 -->
@@ -50,11 +50,12 @@
             <block wx:if="{{card_field}}">
               <!-- 等级价>0 -->
               <block wx:if="{{item[card_field]>0}}">
-                <view class="flex ai_and">
+                <view class="flex ai_center">
                   <view class="price">￥{{item[card_field]}}</view>
-                  <view class="card_bg">
-                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                    <view class="card_name">{{card_name}}</view>
+                  <view class="card_bg flex ai-center">
+											<image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+											<!-- <view class="card_name ellipsis-1">{{card_name}}</view> -->
+											<text class="ellipsis-1">{{card_name}}</text>
                   </view>
                 </view>
                 <view class="comment flex jc_sb">
@@ -77,11 +78,13 @@
                   <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
                 </view>
                 <view class="comment flex jc_sb">
-                  <view class="flex ai_and">
+                  <view class="flex ai_center">
                     <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>
-                    <view class="card_bg">
-                      <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                      {{g_filter.get_card_price(item,card_list,1)}}
+                    <view class="card_bg flex">
+											<view class="flex ai-center">
+												<image src="{{url}}/miniapp/images/plus/dj_icon.png" class=""></image>
+												<text class="ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
+											</view>
                     </view>
                   </view>
                   <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
diff --git a/pages/goods/search/search.wxss b/pages/goods/search/search.wxss
index 9929a72..d7cafdb 100644
--- a/pages/goods/search/search.wxss
+++ b/pages/goods/search/search.wxss
@@ -11,7 +11,7 @@
   align-items: center;
   justify-content: center;
   font-size: 32rpx;
-  border-bottom: 1px solid #dfefef;
+  border-bottom: 2rpx solid #E6E6E6;
   background-color: #fff;
 }
 
@@ -64,15 +64,17 @@
   width: 100%;
   min-height: 200rpx;
   padding: 10rpx 0;
-  border-bottom: 1px solid #dfefef;
+  border-bottom: 2rpx solid #E6E6E6;
   font-size: 30rpx;
 }
 
 .img-wrap {
-  float: left;
+  /* float: left; */
   width: 180rpx;
   height: 180rpx;
-  padding: 0 10rpx 10rpx;
+  padding: 0 10rpx 0 30rpx;
+	flex-shrink: 0;
+	/* padding: 10rpx; */
 }
 
 .img-wrap image {
@@ -83,16 +85,17 @@
 .item-cont .title {
   height: 72rpx;
   margin: 16rpx 0;
-  padding-right: 10rpx;
+  padding-right: 30rpx;
   line-height: 36rpx;
   color: #333;
   overflow: hidden;
+	text-align: justify;
 }
 
 .price {
   display: inline-block;
   color: #f23030;
-  line-height: 24rpx;
+  /* line-height: 24rpx; */
   /* padding-bottom: 20rpx; */
 }
 
@@ -226,7 +229,7 @@
   margin-left: 15rpx;
 }
 
-.card_bg {
+/* .card_bg {
   display: flex;
   max-width: 110rpx;
   height: 25rpx;
@@ -241,11 +244,36 @@
   margin-top: 7rpx;
   line-height: 25rpx;
   width: auto;
+} */
+
+.card_bg {
+	box-sizing: border-box;
+  padding: 2rpx 10rpx;
+  /* height: 28rpx; */
+  border-radius: 26rpx;
+  font-size: 18rpx;
+  /* line-height: 28rpx; */
+	max-width: 210rpx;
+  background: #333;
+  color: #fff;
+  margin-left: 8rpx;
 }
 
 .card_bg image {
   width: 19rpx;
   height: 19rpx;
+  margin-right: 8rpx;
+	flex-shrink: 0;
+}
+
+.card_name {
+	position: relative;
+	top: -4rpx;
+}
+
+/* .card_bg image {
+  width: 19rpx;
+  height: 19rpx;
   margin-right: 1rpx;
   vertical-align: middle;
 }
@@ -255,7 +283,7 @@
   width: auto;
   overflow: hidden;
   white-space: nowrap;
-}
+} */
 
 .mk_price {
   margin-left: 10rpx;
@@ -263,5 +291,6 @@
 }
 
 .item-cont {
-  line-height: 38rpx;
+  /* line-height: 38rpx; */
+	flex-grow: 1;
 }
--
libgit2 0.21.4