From 6002f2bc977eee8628a31cf519112aad5d0e539a Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Wed, 26 Aug 2020 16:48:00 +0800
Subject: [PATCH] 等级卡修改

---
 components/goods_list/goods_list.wxml |  8 +++++---
 components/goods_list/goods_list.wxss | 19 +++++++++++++++----
 pages/goods/goodsList/goodsList.wxml  |  4 ++--
 pages/goods/goodsList/goodsList.wxss  | 18 +++++++++++-------
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 9db5dde..6599128 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -86,13 +86,15 @@
                       <view class="fs22">{{item.market_price}}</view>
                     </view>
                   </view>
-                  <view class="flex" style="line-height: 28rpx;">
+                  <view class="flexr" style="">
                     <!-- 等级价 -->
-										<view class="price flex ai_and">
+										<view class="price flex ai-center">
 										  <view class="fs22">￥</view>
 										  <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
 										  <view class="card_bg ellipsis-1">
-										    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>{{g_filter.get_card_price(item,card_list,1)}}</view>
+										    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>
+												<text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+											</view>
 										</view>
                   </view>
                 </block>
diff --git a/components/goods_list/goods_list.wxss b/components/goods_list/goods_list.wxss
index 7f1e0ab..d138588 100644
--- a/components/goods_list/goods_list.wxss
+++ b/components/goods_list/goods_list.wxss
@@ -3,6 +3,10 @@
   margin-bottom: 40rpx;
 }
 
+.ai-center{
+  align-items: center;
+}
+
 .ib {
   display: inline-block;
 }
@@ -184,11 +188,11 @@
 	box-sizing: border-box;
   /* display: flex; */
   padding: 2rpx 10rpx;
-  height: 25rpx;
+  height: 28rpx;
   /* align-items: center; */
   border-radius: 26rpx;
-  font-size: 19rpx;
-  line-height: 1em;
+  font-size: 18rpx;
+  line-height: 28rpx;
   /* max-width: 110rpx; */
 	max-width: 220rpx;
   background: #333;
@@ -203,9 +207,16 @@
   margin-right: 8rpx;
 }
 
-.card_bg .card_name {
+/* .card_bg .card_name {
   max-width: 76rpx;
   width: auto;
   overflow: hidden;
   white-space: nowrap;
+} */
+
+.card_name {
+	position: relative;
+	top: -4rpx;
 }
+
+
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index f2ba733..fdf5099 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -71,7 +71,7 @@
                   <view class="price">￥{{item[card_field]}}</view>
                   <view class="card_bg ellipsis-1">
                     <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                    <view class="card_name">{{card_name}}</view>
+                    <text class="card_name">{{card_name}}</text>
                   </view>
                 </view>
                 <view class="comment flex jc_sb">
@@ -98,7 +98,7 @@
                     <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>
                     <view class="card_bg ellipsis-1">
                       <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                      {{g_filter.get_card_price(item,card_list,1)}}
+                      <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
                     </view>
                   </view>
                   <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
diff --git a/pages/goods/goodsList/goodsList.wxss b/pages/goods/goodsList/goodsList.wxss
index 61e005c..9c1375f 100644
--- a/pages/goods/goodsList/goodsList.wxss
+++ b/pages/goods/goodsList/goodsList.wxss
@@ -175,29 +175,33 @@
 	
 	box-sizing: border-box;
 	padding: 2rpx 10rpx;
-	height: 25rpx;
+	height: 28rpx;
 	border-radius: 26rpx;
-	font-size: 19rpx;
-	line-height: 1em;
+	font-size: 18rpx;
+	line-height: 28rpx;
 	max-width: 220rpx;
 	background: #333;
 	color: #fff;
 	margin-left: 8rpx;
-
 }
 
-.card_bg .card_name {
+/* .card_bg .card_name {
   max-width: 76rpx;
   width: auto;
   overflow: hidden;
   white-space: nowrap;
+} */
+
+.card_name {
+	position: relative;
+	top: -4rpx;
 }
 
+
 .card_bg image {
   width: 19rpx;
   height: 19rpx;
-  margin-right: 1rpx;
-  vertical-align: middle;
+  margin-right: 8rpx;
 }
 
 .mk_price {
--
libgit2 0.21.4