Commit 2dd758aab20df625dd806bd68747a7b612caebfb
1 parent
3debf188
修改等级卡样式,让它可以显示6个字符
Showing
4 changed files
with
8 additions
and
35 deletions
components/goods_list/goods_list.wxss
| @@ -173,8 +173,8 @@ | @@ -173,8 +173,8 @@ | ||
| 173 | align-items: center; | 173 | align-items: center; |
| 174 | border-radius: 26rpx; | 174 | border-radius: 26rpx; |
| 175 | font-size: 19rpx; | 175 | font-size: 19rpx; |
| 176 | - line-height: 25rpx; | ||
| 177 | - max-width: 110rpx; | 176 | + line-height: 1em; |
| 177 | + /* max-width: 110rpx; */ | ||
| 178 | background: #333; | 178 | background: #333; |
| 179 | color: #fff; | 179 | color: #fff; |
| 180 | justify-content: center; | 180 | justify-content: center; |
| @@ -184,7 +184,7 @@ | @@ -184,7 +184,7 @@ | ||
| 184 | .card_bg image { | 184 | .card_bg image { |
| 185 | width: 19rpx; | 185 | width: 19rpx; |
| 186 | height: 19rpx; | 186 | height: 19rpx; |
| 187 | - margin-right: 1rpx; | 187 | + margin-right: 8rpx; |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | .card_bg .card_name { | 190 | .card_bg .card_name { |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -282,7 +282,7 @@ | @@ -282,7 +282,7 @@ | ||
| 282 | <view wx:if="{{!card_field }}"> | 282 | <view wx:if="{{!card_field }}"> |
| 283 | <view class="beauty-makeup-frame flex ai-center"> | 283 | <view class="beauty-makeup-frame flex ai-center"> |
| 284 | <view class="left flex ai-center"> | 284 | <view class="left flex ai-center"> |
| 285 | - <view class="flex ai-center grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" > | 285 | + <view class="flex ai-center grade-card-frame card-frame advert-card"> |
| 286 | <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | 286 | <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> |
| 287 | <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view> | 287 | <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view> |
| 288 | </view> | 288 | </view> |
| @@ -302,7 +302,7 @@ | @@ -302,7 +302,7 @@ | ||
| 302 | <view wx:elif="{{is_near_date && data[card_field]>0}}"> | 302 | <view wx:elif="{{is_near_date && data[card_field]>0}}"> |
| 303 | <view class="beauty-makeup-frame flex ai-center"> | 303 | <view class="beauty-makeup-frame flex ai-center"> |
| 304 | <view class="left flex ai-center"> | 304 | <view class="left flex ai-center"> |
| 305 | - <view class="flex ai-center grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" > | 305 | + <view class="flex ai-center grade-card-frame card-frame advert-card"> |
| 306 | <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | 306 | <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> |
| 307 | <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view> | 307 | <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view> |
| 308 | </view> | 308 | </view> |
pages/goods/goodsInfo/goodsInfo.wxss
| @@ -2547,8 +2547,8 @@ border-radius: 55rpx; | @@ -2547,8 +2547,8 @@ border-radius: 55rpx; | ||
| 2547 | 2547 | ||
| 2548 | } | 2548 | } |
| 2549 | .grade-card-frame .card-name{ | 2549 | .grade-card-frame .card-name{ |
| 2550 | - margin-left: 5rpx; | ||
| 2551 | - max-width: 120rpx; | 2550 | + margin-left: 8rpx; |
| 2551 | + /* max-width: 120rpx; */ | ||
| 2552 | } | 2552 | } |
| 2553 | .card-effect{ | 2553 | .card-effect{ |
| 2554 | margin-left: 15rpx; | 2554 | margin-left: 15rpx; |
pages/justTest/justTest.wxml
| @@ -15,32 +15,5 @@ | @@ -15,32 +15,5 @@ | ||
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | - | ||
| 19 | -<view class="box"> | ||
| 20 | - <image class="img" src="{{photoUrl}}" bindtap='onPreviewImage'></image> | ||
| 21 | - <view class="btn"> | ||
| 22 | - <button bindtap="onSaveToPhone" class="btn button-hover"> | ||
| 23 | - 保存图片到手机1 | ||
| 24 | - </button> | ||
| 25 | - <!-- <button wx:else bind:tap="showModal" class="btn button-hover" > | ||
| 26 | - 保存图片到手机2 | ||
| 27 | - </button> --> | ||
| 28 | - <!-- 我们不使用点击按钮即打开设置页面的方式,而是使用上面那种先显示提示框让用户点确定按钮后再打开设置页面 --> | ||
| 29 | - <!-- <button wx:else bind:opensetting="onOpenSetting" open-type="openSetting" class="btn button-hover" > | ||
| 30 | - 保存二维码到手机 | ||
| 31 | - </button> --> | ||
| 32 | - </view> | ||
| 33 | -</view> | ||
| 34 | - | ||
| 35 | -<button bindtap="saveImage">savepics</button> | ||
| 36 | - | ||
| 37 | - | ||
| 38 | - | ||
| 39 | -<!-- 直播组件 - --> | ||
| 40 | -<!-- <subscribe room-id="1"></subscribe> --> | ||
| 41 | - | ||
| 42 | -<open-data type="userAvatarUrl"></open-data> | ||
| 43 | -<open-data type="userNickName"></open-data> | ||
| 44 | - | ||
| 45 | - | 18 | +<button bindtap="showac"></button> |
| 46 | 19 |