wxd / MShopWeApp

Commit 09f2b7521d2e33b78d382c727bbd395fc6ab46da

Authored by yvan.ni
2 parents 6ba0bed4 98682583

Merge branch 'work-1.1_20191010' of http://git.vipzhuang.cn/wxd/MShopWeApp into work-1.1_20191010

Inline Side-by-side
Showing 3 changed files with 30 additions and 15 deletions
app.json
  View file @09f2b75
... ... @@ -68,7 +68,8 @@
68 68 "pages/user/user_spsy/user_spsy",
69 69 "pages/user/user_fw/user_fw",
70 70 "pages/user/user_coupon/user_coupon",
71   - "pages/user/grow_value/grow_value"
  71 + "pages/user/grow_value/grow_value",
  72 + "pages/payment/pay_success/pay_success"
72 73  
73 74 ],
74 75 "window": {
... ...
pages/goods/categoryList/categoryList.wxml
  View file @09f2b75
... ... @@ -145,8 +145,7 @@
145 145 </view>
146 146  
147 147 </view>
148   - <view wx:else class="sort-name">
149   - {{ittms.items.name}}
  148 + <view wx:else class="sort-name ellipsis-1">{{ittms.items.name}}
150 149 </view>
151 150 </view>
152 151  
... ... @@ -197,8 +196,8 @@
197 196 <view class="brand_img_frame "wx:for="{{brand_list.array}}"wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
198 197  
199 198 <view class="brand_img t-c">
200   - <image class="brand_img"src="{{user.logo}}"data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr"></image>
201   - <view class="brand_img_name fs24">{{user.name}}</view>
  199 + <image class=" brand_img" src="{{user.logo}}"data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr"></image>
  200 + <view class="brand_img_name ellipsis-2 fs24">{{user.name}}</view>
202 201 </view>
203 202 </view>
204 203  
... ... @@ -220,9 +219,9 @@
220 219 <view class="classify_content-frame flex-wrap">
221 220 <block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="indx">
222 221  
223   - <view class="brand_img_frame t-c ib" data-cid="{{goods.items.id}}" data-pid="{{goods.items.parent_id}}" bindtap="go_cate">
224   - <image class="brand_img"src="{{goods.items.icoimg==null||goods.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':goods.items.icoimg}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
225   - <view class="brand_img_name fs24">{{goods.items.name}}</view>
  222 + <view class="type_img_frame t-c ib" data-cid="{{goods.items.id}}" data-pid="{{goods.items.parent_id}}" bindtap="go_cate">
  223 + <image class=" type_img" src="{{goods.items.icoimg==null||goods.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':goods.items.icoimg}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
  224 + <view class="brand_img_name fs24 ellipsis-2">{{goods.items.name}}</view>
226 225 </view>
227 226  
228 227 </block>
... ... @@ -248,9 +247,9 @@
248 247  
249 248 <block wx:if="{{goods.arrays.length>0}}">
250 249 <view class="classify_content-frame flex-wrap">
251   - <view class="brand_img_frame t-c ib" data-cid="{{item.id}}" data-pid="three" wx:for="{{goods.arrays}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate">
252   - <image class="brand_img"src="{{item.icoimg==null||item.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':item.icoimg}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
253   - <view class="brand_img_name fs24">{{item.name}}</view>
  250 + <view class="type_img_frame t-c ib" data-cid="{{item.id}}" data-pid="three" wx:for="{{goods.arrays}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate">
  251 + <image class=" type_img"src="{{item.icoimg==null||item.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':item.icoimg}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
  252 + <view class="brand_img_name fs24 ellipsis-2">{{item.name}}</view>
254 253 </view>
255 254 </view>
256 255 <view class="divider_line"></view>
... ...
pages/goods/categoryList/categoryList.wxss
  View file @09f2b75
... ... @@ -322,6 +322,19 @@ line-height: 65rpx;
322 322 font-size: 24rpx;
323 323 }
324 324 .brand_img_frame{
  325 + width: 45%;
  326 + margin-top: 18rpx;
  327 + margin-right: 15rpx;
  328 + height: 160rpx;
  329 + }
  330 + .brand_img{
  331 + width:200rpx;
  332 + height:86rpx;
  333 + margin-bottom: 10rpx;
  334 + margin-top: 10rpx;
  335 +
  336 + }
  337 + .type_img_frame{
325 338 width: 30%;
326 339 height: 140rpx;
327 340 margin-top: 18rpx;
... ... @@ -330,16 +343,18 @@ line-height: 65rpx;
330 343  
331 344 }
332 345  
333   - .brand_img{
334   - width:65%;
335   - height:63%;
  346 +
  347 +
  348 + .type_img{
  349 + width:80rpx;
  350 + height:80rpx;
336 351 margin-bottom: 10rpx;
337 352 margin-top: 10rpx;
338 353  
339 354 }
340 355 .brand_img-name{
341 356 width: 100%;
342   - height: 20%;
  357 + height: 80rpx;
343 358 }
344 359 .select_classify.width80.text3{
345 360 padding-right: 20rpx;
... ...