Commit b30c3dc1eb1c66fb6bb9ad0f5756dcd383711e67
Merge branch 'qa' into 'master'
Qa See merge request !114
Showing
4 changed files
with
12 additions
and
5 deletions
pages/goods/categoryList/categoryList.wxml
| ... | ... | @@ -187,7 +187,7 @@ |
| 187 | 187 | |
| 188 | 188 | <view class="brand_img t-c"> |
| 189 | 189 | <image class=" brand_img" src="{{user.logo}}"data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image> |
| 190 | - <view class="brand_img_name ellipsis-2 fs24">{{user.name}}</view> | |
| 190 | + <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view> | |
| 191 | 191 | </view> |
| 192 | 192 | </view> |
| 193 | 193 | |
| ... | ... | @@ -200,7 +200,7 @@ |
| 200 | 200 | <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}"> |
| 201 | 201 | <view> |
| 202 | 202 | <view class="classify_name fs32 flex-space-between"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'> |
| 203 | - <view>{{classify_name}}</view> | |
| 203 | + <view class="classify_title ellipsis-1">{{classify_name}}</view> | |
| 204 | 204 | <view class="flex select_more" > |
| 205 | 205 | <view class="red-co fs24" >更多</view> |
| 206 | 206 | <view class="bg_right width_height"></view> |
| ... | ... | @@ -230,7 +230,7 @@ |
| 230 | 230 | <view> |
| 231 | 231 | |
| 232 | 232 | <view class="classify_name fs32 flex-space-between"data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'> |
| 233 | - <view>{{goods.items.name}}</view> | |
| 233 | + <view class="classify_title ellipsis-1">上帝是世界第四aaaaaaaaaa{{goods.items.name}}</view> | |
| 234 | 234 | <view class="flex select_more" > |
| 235 | 235 | <view class="red-co fs24" >更多</view> |
| 236 | 236 | <view class="bg_right width_height"></view> | ... | ... |
pages/goods/categoryList/categoryList.wxss
| ... | ... | @@ -386,4 +386,7 @@ margin: auto; |
| 386 | 386 | .nation_z_name{ max-width: 130rpx} |
| 387 | 387 | .nation_y_name{ max-width: 130rpx; color: #888} |
| 388 | 388 | |
| 389 | -.no_child_lev{width: 100%; text-align: center; color: #adadad; padding-top: 30rpx} | |
| 390 | 389 | \ No newline at end of file |
| 390 | +.no_child_lev{width: 100%; text-align: center; color: #adadad; padding-top: 30rpx} | |
| 391 | +.classify_title { | |
| 392 | + width: 80%; | |
| 393 | +} | |
| 391 | 394 | \ No newline at end of file | ... | ... |
pages/index/index/index.wxml
| ... | ... | @@ -105,7 +105,7 @@ |
| 105 | 105 | <view class="circle xc-class-frame t-c"> |
| 106 | 106 | <image class="xc-class-img" src="{{item.icoimg==null||item.icoimg==''?url+item.icon:item.icoimg}}" binderror="bind_bnerr_icon" |
| 107 | 107 | data-err="gd_category[{{index}}].icon"></image> |
| 108 | - <view class="fs24">{{item.name}}</view> | |
| 108 | + <view class="fs24 gonju ellipsis-1">{{item.name}}</view> | |
| 109 | 109 | </view> |
| 110 | 110 | </view> |
| 111 | 111 | </view> | ... | ... |