Commit 1886bf451a30c415b6a05315c45c0b5c18df8cfd
1 parent
a165bbe9
等级卡样式调整
Showing
7 changed files
with
14 additions
and
9 deletions
components/goods_list/g_filter.wxs
@@ -59,7 +59,7 @@ var g_filters = { | @@ -59,7 +59,7 @@ var g_filters = { | ||
59 | } | 59 | } |
60 | 60 | ||
61 | if(type==0) return min_price; | 61 | if(type==0) return min_price; |
62 | - if(min_name.length>7 ) min_name=min_name.substring(0, 8); | 62 | + if(min_name.length>4 ) min_name=min_name.substring(0, 8); |
63 | return min_name; | 63 | return min_name; |
64 | }, | 64 | }, |
65 | } | 65 | } |
components/goods_list/goods_list.js
@@ -62,7 +62,7 @@ Component({ | @@ -62,7 +62,7 @@ Component({ | ||
62 | //--- 判断是等级会员,且在有效期范围内 --- | 62 | //--- 判断是等级会员,且在有效期范围内 --- |
63 | if (user.card_field && now < end) { | 63 | if (user.card_field && now < end) { |
64 | var card_name = ob.name_map.get(user.card_field); | 64 | var card_name = ob.name_map.get(user.card_field); |
65 | - if (card_name.length > 6) card_name = card_name.substring(0, 6); | 65 | + if (card_name.length > 4) card_name = card_name.substring(0, 8); |
66 | th.setData({ | 66 | th.setData({ |
67 | card_field: user.card_field, | 67 | card_field: user.card_field, |
68 | card_name: card_name, | 68 | card_name: card_name, |
pages/goods/categoryList/categoryList.wxml
@@ -457,11 +457,11 @@ | @@ -457,11 +457,11 @@ | ||
457 | <view class="word-line xc-ash mk_price">¥{{item.market_price}}</view> | 457 | <view class="word-line xc-ash mk_price">¥{{item.market_price}}</view> |
458 | </view> | 458 | </view> |
459 | <view class="comment flex jc_sb"> | 459 | <view class="comment flex jc_sb"> |
460 | - <view class="flex ai_and"> | 460 | + <view class="flex ai-center"> |
461 | <view class="">¥{{g_filter.get_card_price(item,card_list,0)}}</view> | 461 | <view class="">¥{{g_filter.get_card_price(item,card_list,0)}}</view> |
462 | - <view class="card_bg"> | 462 | + <view class="card_bg flex ai-center"> |
463 | <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | 463 | <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> |
464 | - {{g_filter.get_card_price(item,card_list,1)}} | 464 | + <text>{{g_filter.get_card_price(item,card_list,1)}}</text> |
465 | </view> | 465 | </view> |
466 | </view> | 466 | </view> |
467 | </view> | 467 | </view> |
pages/goods/categoryList/g_filter.wxs
@@ -81,7 +81,7 @@ var g_filters = { | @@ -81,7 +81,7 @@ var g_filters = { | ||
81 | //-- 获取最下价钱,和相应的卡的名称 -- | 81 | //-- 获取最下价钱,和相应的卡的名称 -- |
82 | if(type==0) return min_price.toFixed(2); | 82 | if(type==0) return min_price.toFixed(2); |
83 | 83 | ||
84 | - if(min_name.length>7) min_name=min_name.substring(0, 8); | 84 | + if(min_name.length>4) min_name=min_name.substring(0, 8); |
85 | return min_name; | 85 | return min_name; |
86 | }, | 86 | }, |
87 | } | 87 | } |
pages/goods/goodsInfo/g_filter.wxs
@@ -77,7 +77,7 @@ var g_filters = { | @@ -77,7 +77,7 @@ var g_filters = { | ||
77 | //min_price=min.price; | 77 | //min_price=min.price; |
78 | //min_name=min.name; | 78 | //min_name=min.name; |
79 | if(type==0) return min_price.toFixed(2); | 79 | if(type==0) return min_price.toFixed(2); |
80 | - if(min_name.length>7) min_name=min_name.substring(0, 8); | 80 | + if(min_name.length>4) min_name=min_name.substring(0, 8); |
81 | return min_name; | 81 | return min_name; |
82 | }, | 82 | }, |
83 | } | 83 | } |
pages/goods/goodsInfo/goodsInfo.wxss
@@ -948,7 +948,7 @@ left:31rpx;} | @@ -948,7 +948,7 @@ left:31rpx;} | ||
948 | .item_right text{ margin-left: 66rpx;} | 948 | .item_right text{ margin-left: 66rpx;} |
949 | 949 | ||
950 | .bzfu_img{ width: 164rpx; height:34rpx; margin-right: 18rpx; margin-left: 12rpx } | 950 | .bzfu_img{ width: 164rpx; height:34rpx; margin-right: 18rpx; margin-left: 12rpx } |
951 | - .bz_view{ height:100rpx; padding: 0 13rpx; color: #333; font-size: 28rpx; | 951 | + .bz_view{ height:100rpx; padding: 0 34rpx 0 13rpx; color: #333; font-size: 28rpx; |
952 | border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; } | 952 | border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; } |
953 | .bz_view view{ width: 460rpx; max-height: 70rpx; overflow: hidden;} | 953 | .bz_view view{ width: 460rpx; max-height: 70rpx; overflow: hidden;} |
954 | 954 | ||
@@ -963,6 +963,11 @@ left:31rpx;} | @@ -963,6 +963,11 @@ left:31rpx;} | ||
963 | } | 963 | } |
964 | .bg_jj.down1{transform: rotate(135deg);} | 964 | .bg_jj.down1{transform: rotate(135deg);} |
965 | 965 | ||
966 | +.bz-content { | ||
967 | + flex-grow: 1; | ||
968 | + text-align: justify; | ||
969 | +} | ||
970 | + | ||
966 | /* 顶部边框 */ | 971 | /* 顶部边框 */ |
967 | .topframe{ | 972 | .topframe{ |
968 | width: 100%; | 973 | width: 100%; |
pages/goods/goodsList/g_filter.wxs
@@ -76,7 +76,7 @@ var g_filters = { | @@ -76,7 +76,7 @@ var g_filters = { | ||
76 | //-- 获取最下价钱,和相应的卡的名称 -- | 76 | //-- 获取最下价钱,和相应的卡的名称 -- |
77 | if(type==0) return min_price.toFixed(2); | 77 | if(type==0) return min_price.toFixed(2); |
78 | 78 | ||
79 | - if(min_name.length>7) min_name=min_name.substring(0, 8); | 79 | + if(min_name.length>4) min_name=min_name.substring(0, 8); |
80 | return min_name; | 80 | return min_name; |
81 | }, | 81 | }, |
82 | } | 82 | } |