From 1886bf451a30c415b6a05315c45c0b5c18df8cfd Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Wed, 30 Sep 2020 15:28:59 +0800
Subject: [PATCH] 等级卡样式调整

---
 components/goods_list/g_filter.wxs         | 2 +-
 components/goods_list/goods_list.js        | 2 +-
 pages/goods/categoryList/categoryList.wxml | 6 +++---
 pages/goods/categoryList/g_filter.wxs      | 2 +-
 pages/goods/goodsInfo/g_filter.wxs         | 2 +-
 pages/goods/goodsInfo/goodsInfo.wxss       | 7 ++++++-
 pages/goods/goodsList/g_filter.wxs         | 2 +-
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/components/goods_list/g_filter.wxs b/components/goods_list/g_filter.wxs
index f41a711..608fb4d 100644
--- a/components/goods_list/g_filter.wxs
+++ b/components/goods_list/g_filter.wxs
@@ -59,7 +59,7 @@ var g_filters = {
 				 }	
 				 			   
 			     if(type==0) return min_price;	
-				 if(min_name.length>7 )	min_name=min_name.substring(0, 8);	 
+				 if(min_name.length>4 )	min_name=min_name.substring(0, 8);	 
 			     return min_name;
 		},
 }
diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js
index 287046b..460fbe6 100644
--- a/components/goods_list/goods_list.js
+++ b/components/goods_list/goods_list.js
@@ -62,7 +62,7 @@ Component({
                     //--- 判断是等级会员，且在有效期范围内 ---
                     if (user.card_field && now < end) {
                       var card_name = ob.name_map.get(user.card_field);
-                      if (card_name.length > 6) card_name = card_name.substring(0, 6);
+                      if (card_name.length > 4) card_name = card_name.substring(0, 8);
                       th.setData({
                         card_field: user.card_field,
                         card_name: card_name,
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 1a0f728..bed28bf 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -457,11 +457,11 @@
                                       <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">
+                                        <view class="card_bg flex ai-center">
                                           <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                          {{g_filter.get_card_price(item,card_list,1)}}
+                                          <text>{{g_filter.get_card_price(item,card_list,1)}}</text>
                                         </view>
                                       </view>
                                     </view>
diff --git a/pages/goods/categoryList/g_filter.wxs b/pages/goods/categoryList/g_filter.wxs
index e56218e..429e75a 100644
--- a/pages/goods/categoryList/g_filter.wxs
+++ b/pages/goods/categoryList/g_filter.wxs
@@ -81,7 +81,7 @@ var g_filters = {
 				 //-- 获取最下价钱，和相应的卡的名称 --		  			   
 			     if(type==0) return min_price.toFixed(2);	
 					 
-				 if(min_name.length>7)	min_name=min_name.substring(0, 8);
+				 if(min_name.length>4)	min_name=min_name.substring(0, 8);
 			     return min_name;
 		},
 }
diff --git a/pages/goods/goodsInfo/g_filter.wxs b/pages/goods/goodsInfo/g_filter.wxs
index 67a0bf9..c39bff3 100644
--- a/pages/goods/goodsInfo/g_filter.wxs
+++ b/pages/goods/goodsInfo/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>7)	min_name=min_name.substring(0, 8);	 
+				 if(min_name.length>4)	min_name=min_name.substring(0, 8);	 
 			     return min_name;
 		},
 }
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 126e092..48bcc8b 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -948,7 +948,7 @@ left:31rpx;}
 .item_right text{ margin-left: 66rpx;}
 
 .bzfu_img{ width: 164rpx; height:34rpx; margin-right: 18rpx; margin-left: 12rpx }
- .bz_view{ height:100rpx; padding: 0 13rpx; color: #333; font-size: 28rpx; 
+ .bz_view{ height:100rpx; padding: 0 34rpx 0 13rpx; color: #333; font-size: 28rpx; 
     border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; }
     .bz_view view{ width: 460rpx; max-height: 70rpx; overflow: hidden;}   
 
@@ -963,6 +963,11 @@ left:31rpx;}
 }
 .bg_jj.down1{transform: rotate(135deg);}
 
+.bz-content {
+	flex-grow: 1;
+	text-align: justify;
+}
+
 /* 顶部边框 */
 .topframe{
     width: 100%;
diff --git a/pages/goods/goodsList/g_filter.wxs b/pages/goods/goodsList/g_filter.wxs
index 8aaac6e..52b2ba5 100644
--- a/pages/goods/goodsList/g_filter.wxs
+++ b/pages/goods/goodsList/g_filter.wxs
@@ -76,7 +76,7 @@ var g_filters = {
 				 //-- 获取最下价钱，和相应的卡的名称 --		  			   
 			     if(type==0) return min_price.toFixed(2);	
 					 
-				 if(min_name.length>7)	min_name=min_name.substring(0, 8);
+				 if(min_name.length>4)	min_name=min_name.substring(0, 8);
 			     return min_name;
 		},
 }
--
libgit2 0.21.4